From 3528cc32cb634137cf389beaa9ecdc2036588d96 Mon Sep 17 00:00:00 2001 From: Dennis Gove Date: Wed, 3 Feb 2016 20:17:29 -0500 Subject: [PATCH 01/12] SOLR-8409: Ensures that quotes in solr params (eg. q param) are properly handled --- solr/CHANGES.txt | 2 ++ .../solrj/io/stream/CloudSolrStream.java | 12 +++++++++--- .../expr/StreamExpressionNamedParameter.java | 2 -- .../stream/expr/StreamExpressionParser.java | 9 +++++++++ .../StreamExpressionToExpessionTest.java | 19 +++++++++++++++++++ 5 files changed, 39 insertions(+), 5 deletions(-) diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index afe5a48f9c7..d34b601e0b2 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -158,6 +158,8 @@ Bug Fixes values settings when copying a FieldInfo (Ishan Chattopadhyaya via Mike McCandless) +* SOLR-8409: Ensures that quotes in solr params (eg. q param) are properly handled (Dennis Gove) + Optimizations ---------------------- * SOLR-7876: Speed up queries and operations that use many terms when timeAllowed has not been diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CloudSolrStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CloudSolrStream.java index a1a54bb54d0..f63c6427c13 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CloudSolrStream.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CloudSolrStream.java @@ -21,7 +21,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -38,8 +37,8 @@ import org.apache.solr.client.solrj.impl.CloudSolrClient; import org.apache.solr.client.solrj.io.SolrClientCache; import org.apache.solr.client.solrj.io.Tuple; import org.apache.solr.client.solrj.io.comp.ComparatorOrder; -import org.apache.solr.client.solrj.io.comp.MultipleFieldComparator; import org.apache.solr.client.solrj.io.comp.FieldComparator; +import org.apache.solr.client.solrj.io.comp.MultipleFieldComparator; import org.apache.solr.client.solrj.io.comp.StreamComparator; import org.apache.solr.client.solrj.io.stream.expr.Expressible; import org.apache.solr.client.solrj.io.stream.expr.StreamExpression; @@ -165,7 +164,14 @@ public class CloudSolrStream extends TupleStream implements Expressible { // parameters for(Entry param : params.entrySet()){ - expression.addParameter(new StreamExpressionNamedParameter(param.getKey(), param.getValue())); + String value = param.getValue(); + + // SOLR-8409: This is a special case where the params contain a " character + // Do note that in any other BASE streams with parameters where a " might come into play + // that this same replacement needs to take place. + value = value.replace("\"", "\\\""); + + expression.addParameter(new StreamExpressionNamedParameter(param.getKey(), value)); } // zkHost diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionNamedParameter.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionNamedParameter.java index 74fdb41ee7a..cc1233c9ac8 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionNamedParameter.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionNamedParameter.java @@ -1,7 +1,5 @@ package org.apache.solr.client.solrj.io.stream.expr; -import java.util.ArrayList; -import java.util.List; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionParser.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionParser.java index 305e121e199..1593f09a075 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionParser.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionParser.java @@ -105,6 +105,15 @@ public class StreamExpressionParser { throw new IllegalArgumentException(String.format(Locale.ROOT,"'%s' is not a proper named parameter clause", working)); } } + + // if contain \" replace with " + if(parameter.contains("\\\"")){ + parameter = parameter.replace("\\\"", "\""); + if(0 == parameter.length()){ + throw new IllegalArgumentException(String.format(Locale.ROOT,"'%s' is not a proper named parameter clause", working)); + } + } + namedParameter.setParameter(new StreamExpressionValue(parameter)); } diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionToExpessionTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionToExpessionTest.java index 5eaba9037db..bc98a7b5f1b 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionToExpessionTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionToExpessionTest.java @@ -307,6 +307,25 @@ public class StreamExpressionToExpessionTest extends LuceneTestCase { assertTrue(expressionString.contains("on=\"a_f,a_s\"")); } + @Test + public void testCloudSolrStreamWithEscapedQuote() throws Exception { + + // The purpose of this test is to ensure that a parameter with a contained " character is properly + // escaped when it is turned back into an expression. This is important when an expression is passed + // to a worker (parallel stream) or even for other reasons when an expression is string-ified. + + // Basic test + String originalExpressionString = "search(collection1,fl=\"id,first\",sort=\"first asc\",q=\"presentTitles:\\\"chief, executive officer\\\" AND age:[36 TO *]\")"; + CloudSolrStream firstStream = new CloudSolrStream(StreamExpressionParser.parse(originalExpressionString), factory); + String firstExpressionString = firstStream.toExpression(factory).toString(); + + CloudSolrStream secondStream = new CloudSolrStream(StreamExpressionParser.parse(firstExpressionString), factory); + String secondExpressionString = secondStream.toExpression(factory).toString(); + + assertTrue(firstExpressionString.contains("q=\"presentTitles:\\\"chief, executive officer\\\" AND age:[36 TO *]\"")); + assertTrue(secondExpressionString.contains("q=\"presentTitles:\\\"chief, executive officer\\\" AND age:[36 TO *]\"")); + } + @Test public void testCountMetric() throws Exception { From 62dfc815b030ca051379a12061fb0a9aa98ca09c Mon Sep 17 00:00:00 2001 From: nknize Date: Thu, 4 Feb 2016 00:43:49 -0600 Subject: [PATCH 02/12] fix GeoRelationUtils.pointInPolygon to include points that fall on the boundary --- .../src/java/org/apache/lucene/util/GeoRelationUtils.java | 4 ++-- lucene/sandbox/src/java/org/apache/lucene/util/GeoUtils.java | 3 ++- .../src/test/org/apache/lucene/search/TestGeoPointQuery.java | 3 +++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lucene/sandbox/src/java/org/apache/lucene/util/GeoRelationUtils.java b/lucene/sandbox/src/java/org/apache/lucene/util/GeoRelationUtils.java index 829af266e65..9d42ba18f06 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/util/GeoRelationUtils.java +++ b/lucene/sandbox/src/java/org/apache/lucene/util/GeoRelationUtils.java @@ -50,8 +50,8 @@ public class GeoRelationUtils { * TODO convert coordinates to cylindrical projection (e.g. mercator) */ for (int i = 1; i < x.length; i++) { - if (x[i] < lon && x[i-1] >= lon || x[i-1] < lon && x[i] >= lon) { - if (y[i] + (lon - x[i]) / (x[i-1] - x[i]) * (y[i-1] - y[i]) < lat) { + if (x[i] <= lon && x[i-1] >= lon || x[i-1] <= lon && x[i] >= lon) { + if (y[i] + (lon - x[i]) / (x[i-1] - x[i]) * (y[i-1] - y[i]) <= lat) { inPoly = !inPoly; } } diff --git a/lucene/sandbox/src/java/org/apache/lucene/util/GeoUtils.java b/lucene/sandbox/src/java/org/apache/lucene/util/GeoUtils.java index 030e1dd7126..5239e5adaab 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/util/GeoUtils.java +++ b/lucene/sandbox/src/java/org/apache/lucene/util/GeoUtils.java @@ -218,7 +218,8 @@ public final class GeoUtils { maxLat = Math.max(polyLats[i], maxLat); } // expand bounding box by TOLERANCE factor to handle round-off error - return new GeoRect(minLon - TOLERANCE, maxLon + TOLERANCE, minLat - TOLERANCE, maxLat + TOLERANCE); + return new GeoRect(Math.max(minLon - TOLERANCE, MIN_LON_INCL), Math.min(maxLon + TOLERANCE, MAX_LON_INCL), + Math.max(minLat - TOLERANCE, MIN_LAT_INCL), Math.min(maxLat + TOLERANCE, MAX_LAT_INCL)); } /** diff --git a/lucene/sandbox/src/test/org/apache/lucene/search/TestGeoPointQuery.java b/lucene/sandbox/src/test/org/apache/lucene/search/TestGeoPointQuery.java index 465f61f26d3..9763d6e0cd5 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/search/TestGeoPointQuery.java +++ b/lucene/sandbox/src/test/org/apache/lucene/search/TestGeoPointQuery.java @@ -273,6 +273,9 @@ public class TestGeoPointQuery extends BaseGeoPointTestCase { public void testWholeMap() throws Exception { TopDocs td = bboxQuery(GeoUtils.MIN_LON_INCL, GeoUtils.MIN_LAT_INCL, GeoUtils.MAX_LON_INCL, GeoUtils.MAX_LAT_INCL, 20); assertEquals("testWholeMap failed", 24, td.totalHits); + td = polygonQuery(new double[] {GeoUtils.MIN_LON_INCL, GeoUtils.MIN_LON_INCL, GeoUtils.MAX_LON_INCL, GeoUtils.MAX_LON_INCL, GeoUtils.MIN_LON_INCL}, + new double[] {GeoUtils.MIN_LAT_INCL, GeoUtils.MAX_LAT_INCL, GeoUtils.MAX_LAT_INCL, GeoUtils.MIN_LAT_INCL, GeoUtils.MIN_LAT_INCL}, 20); + assertEquals("testWholeMap failed", 24, td.totalHits); } public void smallTest() throws Exception { From 30455f728b304fb1b434df73b4f84d607e6941ce Mon Sep 17 00:00:00 2001 From: Shai Erera Date: Wed, 3 Feb 2016 14:49:03 +0200 Subject: [PATCH 03/12] LUCENE-7010: add MergePolicyWrapper --- lucene/CHANGES.txt | 3 + .../org/apache/lucene/index/MergePolicy.java | 6 +- .../lucene/index/MergePolicyWrapper.java | 86 +++++++++++++++++++ .../apache/lucene/index/NoMergePolicy.java | 18 +++- .../lucene/index/UpgradeIndexMergePolicy.java | 30 ++----- .../index/TestDemoParallelLeafReader.java | 6 +- .../lucene/index/TestMergePolicyWrapper.java | 31 +++---- .../lucene/index/SortingMergePolicy.java | 17 +--- .../lucene/index/TestSortingMergePolicy.java | 17 ---- .../apache/lucene/index/ForceMergePolicy.java | 45 ++-------- .../solr/util/TestRandomMergePolicy.java | 74 ---------------- .../apache/solr/util/RandomMergePolicy.java | 51 ++--------- 12 files changed, 147 insertions(+), 237 deletions(-) create mode 100644 lucene/core/src/java/org/apache/lucene/index/MergePolicyWrapper.java rename solr/core/src/test/org/apache/solr/util/TestRandomForceMergePolicy.java => lucene/core/src/test/org/apache/lucene/index/TestMergePolicyWrapper.java (57%) mode change 100755 => 100644 delete mode 100644 solr/core/src/test/org/apache/solr/util/TestRandomMergePolicy.java diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt index 5b2314624ae..df6723e90dd 100644 --- a/lucene/CHANGES.txt +++ b/lucene/CHANGES.txt @@ -137,6 +137,9 @@ New Features * SOLR-4619: Added removeAllAttributes() to AttributeSource, which removes all previously added attributes. + +* LUCENE-7010: Added MergePolicyWrapper to allow easy wrapping of other policies. + (Shai Erera) API Changes diff --git a/lucene/core/src/java/org/apache/lucene/index/MergePolicy.java b/lucene/core/src/java/org/apache/lucene/index/MergePolicy.java index dd0b2458e73..10a9ece09c2 100644 --- a/lucene/core/src/java/org/apache/lucene/index/MergePolicy.java +++ b/lucene/core/src/java/org/apache/lucene/index/MergePolicy.java @@ -468,7 +468,7 @@ public abstract class MergePolicy { /** Returns current {@code noCFSRatio}. * * @see #setNoCFSRatio */ - public final double getNoCFSRatio() { + public double getNoCFSRatio() { return noCFSRatio; } @@ -477,7 +477,7 @@ public abstract class MergePolicy { * non-compound file even if compound file is enabled. * Set to 1.0 to always use CFS regardless of merge * size. */ - public final void setNoCFSRatio(double noCFSRatio) { + public void setNoCFSRatio(double noCFSRatio) { if (noCFSRatio < 0.0 || noCFSRatio > 1.0) { throw new IllegalArgumentException("noCFSRatio must be 0.0 to 1.0 inclusive; got " + noCFSRatio); } @@ -494,7 +494,7 @@ public abstract class MergePolicy { * non-compound file even if compound file is enabled. * Set this to Double.POSITIVE_INFINITY (default) and noCFSRatio to 1.0 * to always use CFS regardless of merge size. */ - public final void setMaxCFSSegmentSizeMB(double v) { + public void setMaxCFSSegmentSizeMB(double v) { if (v < 0.0) { throw new IllegalArgumentException("maxCFSSegmentSizeMB must be >=0 (got " + v + ")"); } diff --git a/lucene/core/src/java/org/apache/lucene/index/MergePolicyWrapper.java b/lucene/core/src/java/org/apache/lucene/index/MergePolicyWrapper.java new file mode 100644 index 00000000000..17ecfbeb788 --- /dev/null +++ b/lucene/core/src/java/org/apache/lucene/index/MergePolicyWrapper.java @@ -0,0 +1,86 @@ +/* + * 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.index; + +import java.io.IOException; +import java.util.Map; + +/** + * A wrapper for {@link MergePolicy} instances. + * + * @lucene.experimental + */ +public class MergePolicyWrapper extends MergePolicy { + + protected final MergePolicy in; + + /** + * Creates a new merge policy instance. + */ + public MergePolicyWrapper(MergePolicy in) { + this.in = in; + } + + @Override + public MergeSpecification findMerges(MergeTrigger mergeTrigger, SegmentInfos segmentInfos, IndexWriter writer) + throws IOException { + return in.findMerges(mergeTrigger, segmentInfos, writer); + } + + @Override + public MergeSpecification findForcedMerges(SegmentInfos segmentInfos, int maxSegmentCount, + Map segmentsToMerge, IndexWriter writer) throws IOException { + return in.findForcedMerges(segmentInfos, maxSegmentCount, segmentsToMerge, writer); + } + + @Override + public MergeSpecification findForcedDeletesMerges(SegmentInfos segmentInfos, IndexWriter writer) throws IOException { + return in.findForcedDeletesMerges(segmentInfos, writer); + } + + @Override + public boolean useCompoundFile(SegmentInfos infos, SegmentCommitInfo mergedInfo, IndexWriter writer) + throws IOException { + return in.useCompoundFile(infos, mergedInfo, writer); + } + + @Override + protected long size(SegmentCommitInfo info, IndexWriter writer) throws IOException { + return in.size(info, writer); + } + + @Override + public double getNoCFSRatio() { + return in.getNoCFSRatio(); + } + + @Override + public final void setNoCFSRatio(double noCFSRatio) { + in.setNoCFSRatio(noCFSRatio); + } + + @Override + public final void setMaxCFSSegmentSizeMB(double v) { + in.setMaxCFSSegmentSizeMB(v); + } + + @Override + public String toString() { + return getClass().getSimpleName() + "(" + in + ")"; + } + +} diff --git a/lucene/core/src/java/org/apache/lucene/index/NoMergePolicy.java b/lucene/core/src/java/org/apache/lucene/index/NoMergePolicy.java index 8b5a853b777..cade1353f0b 100644 --- a/lucene/core/src/java/org/apache/lucene/index/NoMergePolicy.java +++ b/lucene/core/src/java/org/apache/lucene/index/NoMergePolicy.java @@ -20,7 +20,6 @@ package org.apache.lucene.index; import java.io.IOException; import java.util.Map; - /** * A {@link MergePolicy} which never returns merges to execute. Use it if you * want to prevent segment merges. @@ -53,7 +52,22 @@ public final class NoMergePolicy extends MergePolicy { protected long size(SegmentCommitInfo info, IndexWriter writer) throws IOException { return Long.MAX_VALUE; } - + + @Override + public double getNoCFSRatio() { + return super.getNoCFSRatio(); + } + + @Override + public void setMaxCFSSegmentSizeMB(double v) { + super.setMaxCFSSegmentSizeMB(v); + } + + @Override + public void setNoCFSRatio(double noCFSRatio) { + super.setNoCFSRatio(noCFSRatio); + } + @Override public String toString() { return "NoMergePolicy"; diff --git a/lucene/core/src/java/org/apache/lucene/index/UpgradeIndexMergePolicy.java b/lucene/core/src/java/org/apache/lucene/index/UpgradeIndexMergePolicy.java index 9374e646bec..ee11f516a49 100644 --- a/lucene/core/src/java/org/apache/lucene/index/UpgradeIndexMergePolicy.java +++ b/lucene/core/src/java/org/apache/lucene/index/UpgradeIndexMergePolicy.java @@ -48,15 +48,12 @@ import java.util.HashMap; * @lucene.experimental * @see IndexUpgrader */ -public class UpgradeIndexMergePolicy extends MergePolicy { - - /** Wrapped {@link MergePolicy}. */ - protected final MergePolicy base; +public class UpgradeIndexMergePolicy extends MergePolicyWrapper { /** Wrap the given {@link MergePolicy} and intercept forceMerge requests to * only upgrade segments written with previous Lucene versions. */ - public UpgradeIndexMergePolicy(MergePolicy base) { - this.base = base; + public UpgradeIndexMergePolicy(MergePolicy in) { + super(in); } /** Returns if the given segment should be upgraded. The default implementation @@ -70,7 +67,7 @@ public class UpgradeIndexMergePolicy extends MergePolicy { @Override public MergeSpecification findMerges(MergeTrigger mergeTrigger, SegmentInfos segmentInfos, IndexWriter writer) throws IOException { - return base.findMerges(null, segmentInfos, writer); + return in.findMerges(null, segmentInfos, writer); } @Override @@ -91,7 +88,7 @@ public class UpgradeIndexMergePolicy extends MergePolicy { if (oldSegments.isEmpty()) return null; - MergeSpecification spec = base.findForcedMerges(segmentInfos, maxSegmentCount, oldSegments, writer); + MergeSpecification spec = in.findForcedMerges(segmentInfos, maxSegmentCount, oldSegments, writer); if (spec != null) { // remove all segments that are in merge specification from oldSegments, @@ -104,7 +101,7 @@ public class UpgradeIndexMergePolicy extends MergePolicy { if (!oldSegments.isEmpty()) { if (verbose(writer)) { - message("findForcedMerges: " + base.getClass().getSimpleName() + + message("findForcedMerges: " + in.getClass().getSimpleName() + " does not want to merge all old segments, merge remaining ones into new segment: " + oldSegments, writer); } final List newInfos = new ArrayList<>(); @@ -123,21 +120,6 @@ public class UpgradeIndexMergePolicy extends MergePolicy { return spec; } - @Override - public MergeSpecification findForcedDeletesMerges(SegmentInfos segmentInfos, IndexWriter writer) throws IOException { - return base.findForcedDeletesMerges(segmentInfos, writer); - } - - @Override - public boolean useCompoundFile(SegmentInfos segments, SegmentCommitInfo newSegment, IndexWriter writer) throws IOException { - return base.useCompoundFile(segments, newSegment, writer); - } - - @Override - public String toString() { - return "[" + getClass().getSimpleName() + "->" + base + "]"; - } - private boolean verbose(IndexWriter writer) { return writer != null && writer.infoStream.isEnabled("UPGMP"); } diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDemoParallelLeafReader.java b/lucene/core/src/test/org/apache/lucene/index/TestDemoParallelLeafReader.java index 0d25f281a8f..ae41299125c 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDemoParallelLeafReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDemoParallelLeafReader.java @@ -505,7 +505,7 @@ public class TestDemoParallelLeafReader extends LuceneTestCase { } /** Just replaces the sub-readers with parallel readers, so reindexed fields are merged into new segments. */ - private class ReindexingMergePolicy extends MergePolicy { + private class ReindexingMergePolicy extends MergePolicyWrapper { class ReindexingOneMerge extends OneMerge { @@ -596,11 +596,9 @@ public class TestDemoParallelLeafReader extends LuceneTestCase { return wrapped; } - final MergePolicy in; - /** Create a new {@code MergePolicy} that sorts documents with the given {@code sort}. */ public ReindexingMergePolicy(MergePolicy in) { - this.in = in; + super(in); } @Override diff --git a/solr/core/src/test/org/apache/solr/util/TestRandomForceMergePolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestMergePolicyWrapper.java old mode 100755 new mode 100644 similarity index 57% rename from solr/core/src/test/org/apache/solr/util/TestRandomForceMergePolicy.java rename to lucene/core/src/test/org/apache/lucene/index/TestMergePolicyWrapper.java index d818786b438..fa1b5d47b11 --- a/solr/core/src/test/org/apache/solr/util/TestRandomForceMergePolicy.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestMergePolicyWrapper.java @@ -1,10 +1,3 @@ -package org.apache.solr.util; - -import java.io.IOException; - -import org.apache.lucene.index.MergePolicy; -import org.apache.lucene.index.SegmentInfos; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -21,16 +14,24 @@ import org.apache.lucene.index.SegmentInfos; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; -public class TestRandomForceMergePolicy extends TestRandomMergePolicy { +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; - /** - * Ensure it finds no merges - */ - public void testFindMerges() throws IOException { - MergePolicy mp = new RandomForceMergePolicy(); - assertNull(mp.findMerges(null, (SegmentInfos)null, null)); +import org.apache.lucene.util.LuceneTestCase; + +public class TestMergePolicyWrapper extends LuceneTestCase { + + public void testMethodsOverridden() throws Exception { + for (Method m : MergePolicy.class.getDeclaredMethods()) { + if (Modifier.isFinal(m.getModifiers())) continue; + try { + MergePolicyWrapper.class.getDeclaredMethod(m.getName(), m.getParameterTypes()); + } catch (NoSuchMethodException e) { + fail("MergePolicyWrapper needs to override '" + m + "'"); + } + } } } - diff --git a/lucene/misc/src/java/org/apache/lucene/index/SortingMergePolicy.java b/lucene/misc/src/java/org/apache/lucene/index/SortingMergePolicy.java index bd8eb10b1ca..13797ef5001 100644 --- a/lucene/misc/src/java/org/apache/lucene/index/SortingMergePolicy.java +++ b/lucene/misc/src/java/org/apache/lucene/index/SortingMergePolicy.java @@ -23,7 +23,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import org.apache.lucene.analysis.Analyzer; // javadocs import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.MergePolicy; @@ -55,7 +54,7 @@ import org.apache.lucene.util.packed.PackedLongValues; * the order of documents in a segment depend on the number of times the segment * has been merged. * @lucene.experimental */ -public final class SortingMergePolicy extends MergePolicy { +public final class SortingMergePolicy extends MergePolicyWrapper { /** * Put in the {@link SegmentInfo#getDiagnostics() diagnostics} to denote that @@ -221,13 +220,12 @@ public final class SortingMergePolicy extends MergePolicy { return sortingSpec; } - final MergePolicy in; final Sorter sorter; final Sort sort; /** Create a new {@code MergePolicy} that sorts documents with the given {@code sort}. */ public SortingMergePolicy(MergePolicy in, Sort sort) { - this.in = in; + super(in); this.sorter = new Sorter(sort); this.sort = sort; } @@ -256,17 +254,6 @@ public final class SortingMergePolicy extends MergePolicy { return sortedMergeSpecification(in.findForcedDeletesMerges(segmentInfos, writer), writer.infoStream); } - @Override - public boolean useCompoundFile(SegmentInfos segments, - SegmentCommitInfo newSegment, IndexWriter writer) throws IOException { - return in.useCompoundFile(segments, newSegment, writer); - } - - @Override - protected long size(SegmentCommitInfo info, IndexWriter writer) throws IOException { - return in.size(info, writer); - } - @Override public String toString() { return "SortingMergePolicy(" + in + ", sorter=" + sorter + ")"; diff --git a/lucene/misc/src/test/org/apache/lucene/index/TestSortingMergePolicy.java b/lucene/misc/src/test/org/apache/lucene/index/TestSortingMergePolicy.java index bf319fd27a4..9a76fad5c64 100644 --- a/lucene/misc/src/test/org/apache/lucene/index/TestSortingMergePolicy.java +++ b/lucene/misc/src/test/org/apache/lucene/index/TestSortingMergePolicy.java @@ -78,12 +78,6 @@ public class TestSortingMergePolicy extends BaseMergePolicyTestCase { return doc; } - @Override - public void testForceMergeNotNeeded() throws IOException { - // This is a no-op until we figure out why the (super class) test fails. - // https://issues.apache.org/jira/browse/LUCENE-7008 - } - public MergePolicy mergePolicy() { return newSortingMergePolicy(sort); } @@ -204,15 +198,4 @@ public class TestSortingMergePolicy extends BaseMergePolicyTestCase { } } - public void testMethodsOverridden() throws Exception { - for (Method m : MergePolicy.class.getDeclaredMethods()) { - if (Modifier.isFinal(m.getModifiers())) continue; - try { - SortingMergePolicy.class.getDeclaredMethod(m.getName(), m.getParameterTypes()); - } catch (NoSuchMethodException e) { - fail("SortingMergePolicy needs to override '"+m+"'"); - } - } - } - } diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/ForceMergePolicy.java b/lucene/test-framework/src/java/org/apache/lucene/index/ForceMergePolicy.java index 630f8eb08d1..ba5b93736b0 100755 --- a/lucene/test-framework/src/java/org/apache/lucene/index/ForceMergePolicy.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/ForceMergePolicy.java @@ -28,52 +28,23 @@ import org.apache.lucene.index.SegmentInfos; /** * A {@link MergePolicy} that only returns forced merges. - *

NOTE: Use this policy if you wish to disallow background - * merges but wish to run optimize/forceMerge segment merges. + *

+ * NOTE: Use this policy if you wish to disallow background merges but wish to run optimize/forceMerge segment + * merges. * - * @lucene.experimental + * @lucene.experimental */ -public final class ForceMergePolicy extends MergePolicy { - - final MergePolicy in; +public final class ForceMergePolicy extends MergePolicyWrapper { /** Create a new {@code ForceMergePolicy} around the given {@code MergePolicy} */ public ForceMergePolicy(MergePolicy in) { - this.in = in; + super(in); } @Override - public MergeSpecification findMerges(MergeTrigger mergeTrigger, - SegmentInfos segmentInfos, IndexWriter writer) throws IOException { + public MergeSpecification findMerges(MergeTrigger mergeTrigger, SegmentInfos segmentInfos, IndexWriter writer) + throws IOException { return null; } - @Override - public MergeSpecification findForcedMerges(SegmentInfos segmentInfos, - int maxSegmentCount, Map segmentsToMerge, IndexWriter writer) - throws IOException { - return in.findForcedMerges(segmentInfos, maxSegmentCount, segmentsToMerge, writer); - } - - @Override - public MergeSpecification findForcedDeletesMerges(SegmentInfos segmentInfos, IndexWriter writer) - throws IOException { - return in.findForcedDeletesMerges(segmentInfos, writer); - } - - @Override - public boolean useCompoundFile(SegmentInfos segments, - SegmentCommitInfo newSegment, IndexWriter writer) throws IOException { - return in.useCompoundFile(segments, newSegment, writer); - } - - @Override - protected long size(SegmentCommitInfo info, IndexWriter writer) throws IOException { - return in.size(info, writer); - } - - @Override - public String toString() { - return "ForceMergePolicy(" + in + ")"; - } } diff --git a/solr/core/src/test/org/apache/solr/util/TestRandomMergePolicy.java b/solr/core/src/test/org/apache/solr/util/TestRandomMergePolicy.java deleted file mode 100644 index 0fb9940d22e..00000000000 --- a/solr/core/src/test/org/apache/solr/util/TestRandomMergePolicy.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * 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.util; - -import org.apache.lucene.index.MergePolicy; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase.SuppressSysoutChecks; - -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.lang.reflect.InvocationTargetException; - -/** - * A "test the test" sanity check using reflection to ensure that - * {@linke RandomMergePolicy} is working as expected - */ -@SuppressSysoutChecks(bugUrl = "Logs to JUL") -public class TestRandomMergePolicy extends LuceneTestCase { - /** - * Ensure every MP method is overridden by RMP - * (future proof ourselves against new methods being added to MP) - */ - public void testMethodOverride() { - Class rmp = RandomMergePolicy.class; - for (Method meth : rmp.getMethods()) { - if (// ignore things like hashCode, equals, etc... - meth.getDeclaringClass().equals(Object.class) - // can't do anything about it regardless of what class declares it - || Modifier.isFinal(meth.getModifiers())) { - continue; - } - assertEquals("method not overridden by RandomMergePolicy: " + - meth.toGenericString(), - rmp, meth.getDeclaringClass()); - } - } - - /** - * Ensure any "getter" methods return the same value as - * the wrapped MP - * (future proof ourselves against new final getter/setter pairs being - * added to MP w/o dealing with them in the RMP Constructor) - */ - public void testGetters() throws IllegalAccessException, InvocationTargetException { - final int iters = atLeast(20); - for (int i = 0; i < iters; i++) { - RandomMergePolicy rmp = new RandomMergePolicy(); - Class mp = MergePolicy.class; - for (Method meth : mp.getDeclaredMethods()) { - if (meth.getName().startsWith("get") && - (0 == meth.getParameterTypes().length)) { - - assertEquals("MergePolicy getter gave diff results for RandomMergePolicy and the policy it wrapped: " + meth.toGenericString(), - meth.invoke(rmp), meth.invoke(rmp.inner)); - } - } - } - } -} diff --git a/solr/test-framework/src/java/org/apache/solr/util/RandomMergePolicy.java b/solr/test-framework/src/java/org/apache/solr/util/RandomMergePolicy.java index 7c376bfe82c..17c53c0a87c 100644 --- a/solr/test-framework/src/java/org/apache/solr/util/RandomMergePolicy.java +++ b/solr/test-framework/src/java/org/apache/solr/util/RandomMergePolicy.java @@ -23,6 +23,8 @@ import java.util.Map; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.MergePolicy; +import org.apache.lucene.index.MergePolicy.MergeSpecification; +import org.apache.lucene.index.MergePolicyWrapper; import org.apache.lucene.index.MergeTrigger; import org.apache.lucene.index.SegmentCommitInfo; import org.apache.lucene.index.SegmentInfos; @@ -36,60 +38,17 @@ import org.slf4j.LoggerFactory; * Solr tests utilizing the Lucene randomized test framework can refer * to this class in solrconfig.xml to get a fully randomized merge policy. */ -public class RandomMergePolicy extends MergePolicy { +public class RandomMergePolicy extends MergePolicyWrapper { private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); - /** - * Not private so tests can inspect it, - */ - final MergePolicy inner; - public RandomMergePolicy() { this(LuceneTestCase.newMergePolicy()); } protected RandomMergePolicy(MergePolicy inner) { - super(inner.getNoCFSRatio(), - (long) (inner.getMaxCFSSegmentSizeMB() * 1024 * 1024)); - this.inner = inner; - log.info("RandomMergePolicy wrapping {}: {}", - inner.getClass(), inner); - } - - @Override - public MergeSpecification findForcedDeletesMerges(SegmentInfos segmentInfos, IndexWriter writer) - throws IOException { - - return inner.findForcedDeletesMerges(segmentInfos, writer); - } - - @Override - public MergeSpecification findForcedMerges(SegmentInfos segmentInfos, - int maxSegmentCount, - Map segmentsToMerge, - IndexWriter writer) - throws IOException { - - return inner.findForcedMerges(segmentInfos, maxSegmentCount, segmentsToMerge, writer); - } - - @Override - public MergeSpecification findMerges(MergeTrigger mergeTrigger, - SegmentInfos segmentInfos, - IndexWriter writer) - throws IOException { - - return inner.findMerges(mergeTrigger, segmentInfos, writer); - } - - @Override - public boolean useCompoundFile(SegmentInfos infos, - SegmentCommitInfo mergedInfo, - IndexWriter writer) - throws IOException { - - return inner.useCompoundFile(infos, mergedInfo, writer); + super(inner); + log.info("RandomMergePolicy wrapping {}: {}", inner.getClass(), inner); } } From 0c4598d5f4629b515906b31b5977b11882bc944b Mon Sep 17 00:00:00 2001 From: Shai Erera Date: Thu, 4 Feb 2016 11:30:47 +0200 Subject: [PATCH 04/12] LUCENE-7010: add @param to ctor javadocs --- .../src/java/org/apache/lucene/index/MergePolicyWrapper.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lucene/core/src/java/org/apache/lucene/index/MergePolicyWrapper.java b/lucene/core/src/java/org/apache/lucene/index/MergePolicyWrapper.java index 17ecfbeb788..baddcd0592e 100644 --- a/lucene/core/src/java/org/apache/lucene/index/MergePolicyWrapper.java +++ b/lucene/core/src/java/org/apache/lucene/index/MergePolicyWrapper.java @@ -30,6 +30,8 @@ public class MergePolicyWrapper extends MergePolicy { /** * Creates a new merge policy instance. + * + * @param in the wrapped {@link MergePolicy} */ public MergePolicyWrapper(MergePolicy in) { this.in = in; From e6d629d527fe316e0840e1d2fe5ab1d447ce0460 Mon Sep 17 00:00:00 2001 From: Shai Erera Date: Thu, 4 Feb 2016 13:49:37 +0200 Subject: [PATCH 05/12] LUCENE-7010: document protected field --- .../src/java/org/apache/lucene/index/MergePolicyWrapper.java | 1 + 1 file changed, 1 insertion(+) diff --git a/lucene/core/src/java/org/apache/lucene/index/MergePolicyWrapper.java b/lucene/core/src/java/org/apache/lucene/index/MergePolicyWrapper.java index baddcd0592e..c51cd00d7c6 100644 --- a/lucene/core/src/java/org/apache/lucene/index/MergePolicyWrapper.java +++ b/lucene/core/src/java/org/apache/lucene/index/MergePolicyWrapper.java @@ -26,6 +26,7 @@ import java.util.Map; */ public class MergePolicyWrapper extends MergePolicy { + /** The wrapped {@link MergePolicy}. */ protected final MergePolicy in; /** From f85036cd9ce74dd94e29aa3f44851633342c69bd Mon Sep 17 00:00:00 2001 From: Noble Paul Date: Thu, 4 Feb 2016 18:59:03 +0530 Subject: [PATCH 06/12] SOLR-8640: CloudSolrClient does not send credentials for update request --- solr/CHANGES.txt | 2 + .../security/BasicAuthIntegrationTest.java | 62 +++++++++++++------ .../client/solrj/request/UpdateRequest.java | 1 + 3 files changed, 45 insertions(+), 20 deletions(-) diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index d34b601e0b2..ef22a2ff4c0 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -160,6 +160,8 @@ Bug Fixes * SOLR-8409: Ensures that quotes in solr params (eg. q param) are properly handled (Dennis Gove) +* SOLR-8640: CloudSolrClient does not send credentials for update request (noble, hoss) + Optimizations ---------------------- * SOLR-7876: Speed up queries and operations that use many terms when timeAllowed has not been diff --git a/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java b/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java index 271adeb201d..9fca48e79eb 100644 --- a/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java +++ b/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java @@ -18,7 +18,6 @@ package org.apache.solr.security; */ -import java.io.IOException; import java.lang.invoke.MethodHandles; import java.util.ArrayList; import java.util.Collections; @@ -37,14 +36,15 @@ import org.apache.http.message.AbstractHttpMessage; import org.apache.http.message.BasicHeader; import org.apache.http.util.EntityUtils; import org.apache.solr.client.solrj.SolrRequest; -import org.apache.solr.client.solrj.SolrServerException; import org.apache.solr.client.solrj.embedded.JettySolrRunner; import org.apache.solr.client.solrj.impl.CloudSolrClient; import org.apache.solr.client.solrj.impl.HttpSolrClient; import org.apache.solr.client.solrj.request.CollectionAdminRequest; import org.apache.solr.client.solrj.request.GenericSolrRequest; +import org.apache.solr.client.solrj.request.UpdateRequest; import org.apache.solr.cloud.MiniSolrCloudCluster; import org.apache.solr.cloud.TestMiniSolrCloudClusterBase; +import org.apache.solr.common.SolrInputDocument; import org.apache.solr.common.cloud.DocCollection; import org.apache.solr.common.cloud.Replica; import org.apache.solr.common.cloud.Slice; @@ -56,7 +56,6 @@ import org.apache.solr.common.util.ContentStreamBase; import org.apache.solr.common.util.NamedList; import org.apache.solr.common.util.StrUtils; import org.apache.solr.common.util.Utils; -import org.apache.solr.util.CommandOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -73,12 +72,19 @@ public class BasicAuthIntegrationTest extends TestMiniSolrCloudClusterBase { protected void doExtraTests(MiniSolrCloudCluster miniCluster, SolrZkClient zkClient, ZkStateReader zkStateReader, CloudSolrClient cloudSolrClient, String defaultCollName) throws Exception { - NamedList rsp = cloudSolrClient.request(new GenericSolrRequest(SolrRequest.METHOD.GET, "/admin/authentication", new ModifiableSolrParams())); - assertNotNull(rsp.get(CommandOperation.ERR_MSGS)); - zkClient.setData("/security.json", STD_CONF.replaceAll("'", "\"").getBytes(UTF_8), true); - String baseUrl = getRandomReplica(zkStateReader.getClusterState().getCollection(defaultCollName), random()).getStr(BASE_URL_PROP); + + String authcPrefix = "/admin/authentication"; + String authzPrefix = "/admin/authorization"; + + String old = cloudSolrClient.getDefaultCollection(); + cloudSolrClient.setDefaultCollection(null); + + NamedList rsp; HttpClient cl = cloudSolrClient.getLbClient().getHttpClient(); - verifySecurityStatus(cl, baseUrl + "/admin/authentication", "authentication/class", "solr.BasicAuthPlugin", 20); + String baseUrl = getRandomReplica(zkStateReader.getClusterState().getCollection(defaultCollName), random()).getStr(BASE_URL_PROP); + verifySecurityStatus(cl, baseUrl + authcPrefix, "/errorMessages", null, 20); + zkClient.setData("/security.json", STD_CONF.replaceAll("'", "\"").getBytes(UTF_8), true); + verifySecurityStatus(cl, baseUrl + authcPrefix, "authentication/class", "solr.BasicAuthPlugin", 20); boolean found = false; for (JettySolrRunner jettySolrRunner : miniCluster.getJettySolrRunners()) { @@ -86,7 +92,7 @@ public class BasicAuthIntegrationTest extends TestMiniSolrCloudClusterBase { found = true; jettySolrRunner.stop(); jettySolrRunner.start(); - verifySecurityStatus(cl, baseUrl + "/admin/authentication", "authentication/class", "solr.BasicAuthPlugin", 20); + verifySecurityStatus(cl, baseUrl + authcPrefix, "authentication/class", "solr.BasicAuthPlugin", 20); break; } } @@ -96,7 +102,7 @@ public class BasicAuthIntegrationTest extends TestMiniSolrCloudClusterBase { "'set-user': {'harry':'HarryIsCool'}\n" + "}"; - GenericSolrRequest genericReq = new GenericSolrRequest(SolrRequest.METHOD.POST, "/admin/authentication", new ModifiableSolrParams()); + GenericSolrRequest genericReq = new GenericSolrRequest(SolrRequest.METHOD.POST, authcPrefix, new ModifiableSolrParams()); genericReq.setContentStreams(Collections.singletonList(new ContentStreamBase.ByteArrayStream(command.getBytes(UTF_8), ""))); try { cloudSolrClient.request(genericReq); @@ -107,22 +113,22 @@ public class BasicAuthIntegrationTest extends TestMiniSolrCloudClusterBase { "'set-user': {'harry':'HarryIsUberCool'}\n" + "}"; - HttpPost httpPost = new HttpPost(baseUrl + "/admin/authentication"); + HttpPost httpPost = new HttpPost(baseUrl + authcPrefix); setBasicAuthHeader(httpPost, "solr", "SolrRocks"); httpPost.setEntity(new ByteArrayEntity(command.getBytes(UTF_8))); httpPost.addHeader("Content-Type", "application/json; charset=UTF-8"); - verifySecurityStatus(cl, baseUrl + "/admin/authentication", "authentication.enabled", "true", 20); + verifySecurityStatus(cl, baseUrl + authcPrefix, "authentication.enabled", "true", 20); HttpResponse r = cl.execute(httpPost); int statusCode = r.getStatusLine().getStatusCode(); assertEquals("proper_cred sent, but access denied", 200, statusCode); baseUrl = getRandomReplica(zkStateReader.getClusterState().getCollection(defaultCollName), random()).getStr(BASE_URL_PROP); - verifySecurityStatus(cl, baseUrl + "/admin/authentication", "authentication/credentials/harry", NOT_NULL_PREDICATE, 20); + verifySecurityStatus(cl, baseUrl + authcPrefix, "authentication/credentials/harry", NOT_NULL_PREDICATE, 20); command = "{\n" + "'set-user-role': {'harry':'admin'}\n" + "}"; - httpPost = new HttpPost(baseUrl + "/admin/authorization"); + httpPost = new HttpPost(baseUrl + authzPrefix); setBasicAuthHeader(httpPost, "solr", "SolrRocks"); httpPost.setEntity(new ByteArrayEntity(command.getBytes(UTF_8))); httpPost.addHeader("Content-Type", "application/json; charset=UTF-8"); @@ -130,10 +136,10 @@ public class BasicAuthIntegrationTest extends TestMiniSolrCloudClusterBase { assertEquals(200, r.getStatusLine().getStatusCode()); baseUrl = getRandomReplica(zkStateReader.getClusterState().getCollection(defaultCollName), random()).getStr(BASE_URL_PROP); - verifySecurityStatus(cl, baseUrl+"/admin/authorization", "authorization/user-role/harry", NOT_NULL_PREDICATE, 20); + verifySecurityStatus(cl, baseUrl + authzPrefix, "authorization/user-role/harry", NOT_NULL_PREDICATE, 20); - httpPost = new HttpPost(baseUrl + "/admin/authorization"); + httpPost = new HttpPost(baseUrl + authzPrefix); setBasicAuthHeader(httpPost, "harry", "HarryIsUberCool"); httpPost.setEntity(new ByteArrayEntity(Utils.toJSON(singletonMap("set-permission", Utils.makeMap ("name", "x-update", @@ -142,19 +148,19 @@ public class BasicAuthIntegrationTest extends TestMiniSolrCloudClusterBase { "role", "dev"))))); httpPost.addHeader("Content-Type", "application/json; charset=UTF-8"); - verifySecurityStatus(cl, baseUrl + "/admin/authorization", "authorization/user-role/harry", NOT_NULL_PREDICATE, 20); + verifySecurityStatus(cl, baseUrl + authzPrefix, "authorization/user-role/harry", NOT_NULL_PREDICATE, 20); r = cl.execute(httpPost); assertEquals(200, r.getStatusLine().getStatusCode()); - verifySecurityStatus(cl, baseUrl+"/admin/authorization", "authorization/permissions[1]/collection", "x", 20); + verifySecurityStatus(cl, baseUrl + authzPrefix, "authorization/permissions[1]/collection", "x", 20); - httpPost = new HttpPost(baseUrl + "/admin/authorization"); + httpPost = new HttpPost(baseUrl + authzPrefix); setBasicAuthHeader(httpPost, "harry", "HarryIsUberCool"); httpPost.setEntity(new ByteArrayEntity(Utils.toJSON(singletonMap("set-permission", Utils.makeMap ("name","collection-admin-edit", "role", "admin" ))))); r = cl.execute(httpPost); - verifySecurityStatus(cl, baseUrl+"/admin/authorization", "authorization/permissions[2]/name", "collection-admin-edit", 20); + verifySecurityStatus(cl, baseUrl + authzPrefix, "authorization/permissions[2]/name", "collection-admin-edit", 20); CollectionAdminRequest.Reload reload = new CollectionAdminRequest.Reload(); reload.setCollectionName(cloudSolrClient.getDefaultCollection()); @@ -186,6 +192,22 @@ public class BasicAuthIntegrationTest extends TestMiniSolrCloudClusterBase { } + cloudSolrClient.setDefaultCollection(old); + + httpPost = new HttpPost(baseUrl + authzPrefix); + setBasicAuthHeader(httpPost, "harry", "HarryIsUberCool"); + httpPost.setEntity(new ByteArrayEntity("{set-permission : { name : update , role : admin}}".getBytes(UTF_8))); + httpPost.addHeader("Content-Type", "application/json; charset=UTF-8"); + r = cl.execute(httpPost); + assertEquals(200,r.getStatusLine().getStatusCode()); + + SolrInputDocument doc = new SolrInputDocument(); + doc.setField("id","4"); + UpdateRequest update = new UpdateRequest(); + update.setBasicAuthCredentials("harry","HarryIsUberCool"); + update.add(doc); + update.setCommitWithin(100); + cloudSolrClient.request(update); } public static void verifySecurityStatus(HttpClient cl, String url, String objPath, Object expected, int count) throws Exception { diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/UpdateRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/UpdateRequest.java index 4537c79144f..c83639b8e91 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/UpdateRequest.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/UpdateRequest.java @@ -252,6 +252,7 @@ public class UpdateRequest extends AbstractUpdateRequest { updateRequest.setCommitWithin(getCommitWithin()); updateRequest.setParams(params); updateRequest.setPath(getPath()); + updateRequest.setBasicAuthCredentials(getBasicAuthUser(), getBasicAuthPassword()); request = new LBHttpSolrClient.Req(updateRequest, urls); routes.put(leaderUrl, request); } From 813ca77250db29116812bc949e2a466a70f969a3 Mon Sep 17 00:00:00 2001 From: Shai Erera Date: Thu, 4 Feb 2016 11:28:46 +0200 Subject: [PATCH 07/12] LUCENE-7013: Move license header to top of file --- .../lucene/analysis/ar/ArabicAnalyzer.java | 4 +- .../ar/ArabicNormalizationFilter.java | 4 +- .../ar/ArabicNormalizationFilterFactory.java | 4 +- .../lucene/analysis/ar/ArabicNormalizer.java | 4 +- .../lucene/analysis/ar/ArabicStemFilter.java | 4 +- .../analysis/ar/ArabicStemFilterFactory.java | 4 +- .../lucene/analysis/ar/ArabicStemmer.java | 6 +- .../lucene/analysis/ar/package-info.java | 1 - .../lucene/analysis/bg/BulgarianAnalyzer.java | 4 +- .../analysis/bg/BulgarianStemFilter.java | 4 +- .../bg/BulgarianStemFilterFactory.java | 4 +- .../lucene/analysis/bg/BulgarianStemmer.java | 4 +- .../lucene/analysis/bg/package-info.java | 1 - .../lucene/analysis/br/BrazilianAnalyzer.java | 4 +- .../analysis/br/BrazilianStemFilter.java | 4 +- .../br/BrazilianStemFilterFactory.java | 4 +- .../lucene/analysis/br/BrazilianStemmer.java | 8 +- .../lucene/analysis/br/package-info.java | 1 - .../lucene/analysis/ca/CatalanAnalyzer.java | 4 +- .../lucene/analysis/ca/package-info.java | 1 - .../analysis/charfilter/BaseCharFilter.java | 1 - .../charfilter/HTMLStripCharFilter.java | 3 +- .../charfilter/HTMLStripCharFilter.jflex | 3 +- .../HTMLStripCharFilterFactory.java | 4 +- .../charfilter/MappingCharFilter.java | 1 - .../charfilter/MappingCharFilterFactory.java | 4 +- .../analysis/charfilter/NormalizeCharMap.java | 1 - .../analysis/charfilter/package-info.java | 1 - .../lucene/analysis/cjk/CJKAnalyzer.java | 4 +- .../lucene/analysis/cjk/CJKBigramFilter.java | 4 +- .../analysis/cjk/CJKBigramFilterFactory.java | 4 +- .../lucene/analysis/cjk/CJKWidthFilter.java | 4 +- .../analysis/cjk/CJKWidthFilterFactory.java | 4 +- .../lucene/analysis/cjk/package-info.java | 1 - .../lucene/analysis/ckb/SoraniAnalyzer.java | 4 +- .../ckb/SoraniNormalizationFilter.java | 4 +- .../ckb/SoraniNormalizationFilterFactory.java | 4 +- .../lucene/analysis/ckb/SoraniNormalizer.java | 4 +- .../lucene/analysis/ckb/SoraniStemFilter.java | 4 +- .../analysis/ckb/SoraniStemFilterFactory.java | 4 +- .../lucene/analysis/ckb/SoraniStemmer.java | 4 +- .../lucene/analysis/ckb/package-info.java | 1 - .../commongrams/CommonGramsFilter.java | 1 - .../commongrams/CommonGramsFilterFactory.java | 4 +- .../CommonGramsQueryFilterFactory.java | 4 +- .../analysis/commongrams/package-info.java | 1 - .../compound/CompoundWordTokenFilterBase.java | 4 +- .../DictionaryCompoundWordTokenFilter.java | 4 +- ...tionaryCompoundWordTokenFilterFactory.java | 4 +- .../HyphenationCompoundWordTokenFilter.java | 4 +- ...enationCompoundWordTokenFilterFactory.java | 4 +- .../compound/hyphenation/ByteVector.java | 7 +- .../compound/hyphenation/CharVector.java | 7 +- .../analysis/compound/hyphenation/Hyphen.java | 7 +- .../compound/hyphenation/Hyphenation.java | 7 +- .../compound/hyphenation/HyphenationTree.java | 7 +- .../compound/hyphenation/PatternConsumer.java | 7 +- .../compound/hyphenation/PatternParser.java | 7 +- .../compound/hyphenation/TernaryTree.java | 7 +- .../compound/hyphenation/package-info.java | 1 - .../analysis/compound/package-info.java | 1 - .../analysis/core/DecimalDigitFilter.java | 4 +- .../core/DecimalDigitFilterFactory.java | 4 +- .../lucene/analysis/core/KeywordAnalyzer.java | 4 +- .../analysis/core/KeywordTokenizer.java | 4 +- .../core/KeywordTokenizerFactory.java | 4 +- .../lucene/analysis/core/LetterTokenizer.java | 4 +- .../analysis/core/LetterTokenizerFactory.java | 4 +- .../lucene/analysis/core/LowerCaseFilter.java | 4 +- .../analysis/core/LowerCaseFilterFactory.java | 4 +- .../analysis/core/LowerCaseTokenizer.java | 4 +- .../core/LowerCaseTokenizerFactory.java | 4 +- .../lucene/analysis/core/SimpleAnalyzer.java | 4 +- .../lucene/analysis/core/StopAnalyzer.java | 4 +- .../lucene/analysis/core/StopFilter.java | 4 +- .../analysis/core/StopFilterFactory.java | 4 +- .../lucene/analysis/core/TypeTokenFilter.java | 4 +- .../analysis/core/TypeTokenFilterFactory.java | 4 +- .../core/UnicodeWhitespaceAnalyzer.java | 4 +- .../core/UnicodeWhitespaceTokenizer.java | 4 +- .../lucene/analysis/core/UpperCaseFilter.java | 4 +- .../analysis/core/UpperCaseFilterFactory.java | 4 +- .../analysis/core/WhitespaceAnalyzer.java | 4 +- .../analysis/core/WhitespaceTokenizer.java | 4 +- .../core/WhitespaceTokenizerFactory.java | 4 +- .../lucene/analysis/core/package-info.java | 1 - .../analysis/custom/CustomAnalyzer.java | 4 +- .../lucene/analysis/custom/package-info.java | 1 - .../lucene/analysis/cz/CzechAnalyzer.java | 4 +- .../lucene/analysis/cz/CzechStemFilter.java | 20 ++--- .../analysis/cz/CzechStemFilterFactory.java | 4 +- .../lucene/analysis/cz/CzechStemmer.java | 4 +- .../lucene/analysis/cz/package-info.java | 1 - .../lucene/analysis/da/DanishAnalyzer.java | 4 +- .../lucene/analysis/da/package-info.java | 1 - .../lucene/analysis/de/GermanAnalyzer.java | 6 +- .../analysis/de/GermanLightStemFilter.java | 4 +- .../de/GermanLightStemFilterFactory.java | 4 +- .../analysis/de/GermanLightStemmer.java | 4 +- .../analysis/de/GermanMinimalStemFilter.java | 4 +- .../de/GermanMinimalStemFilterFactory.java | 4 +- .../analysis/de/GermanMinimalStemmer.java | 4 +- .../de/GermanNormalizationFilter.java | 4 +- .../de/GermanNormalizationFilterFactory.java | 4 +- .../lucene/analysis/de/GermanStemFilter.java | 4 +- .../analysis/de/GermanStemFilterFactory.java | 4 +- .../lucene/analysis/de/GermanStemmer.java | 12 +-- .../lucene/analysis/de/package-info.java | 1 - .../lucene/analysis/el/GreekAnalyzer.java | 14 +-- .../analysis/el/GreekLowerCaseFilter.java | 14 +-- .../el/GreekLowerCaseFilterFactory.java | 4 +- .../lucene/analysis/el/GreekStemFilter.java | 4 +- .../analysis/el/GreekStemFilterFactory.java | 4 +- .../lucene/analysis/el/GreekStemmer.java | 12 +-- .../lucene/analysis/el/package-info.java | 1 - .../lucene/analysis/en/EnglishAnalyzer.java | 4 +- .../analysis/en/EnglishMinimalStemFilter.java | 4 +- .../en/EnglishMinimalStemFilterFactory.java | 4 +- .../analysis/en/EnglishMinimalStemmer.java | 4 +- .../analysis/en/EnglishPossessiveFilter.java | 4 +- .../en/EnglishPossessiveFilterFactory.java | 4 +- .../lucene/analysis/en/KStemFilter.java | 4 +- .../analysis/en/KStemFilterFactory.java | 4 +- .../apache/lucene/analysis/en/KStemmer.java | 1 - .../lucene/analysis/en/PorterStemFilter.java | 4 +- .../analysis/en/PorterStemFilterFactory.java | 4 +- .../lucene/analysis/en/PorterStemmer.java | 4 +- .../lucene/analysis/en/package-info.java | 1 - .../lucene/analysis/es/SpanishAnalyzer.java | 4 +- .../analysis/es/SpanishLightStemFilter.java | 4 +- .../es/SpanishLightStemFilterFactory.java | 4 +- .../analysis/es/SpanishLightStemmer.java | 4 +- .../lucene/analysis/es/package-info.java | 1 - .../lucene/analysis/eu/BasqueAnalyzer.java | 4 +- .../lucene/analysis/eu/package-info.java | 1 - .../lucene/analysis/fa/PersianAnalyzer.java | 4 +- .../lucene/analysis/fa/PersianCharFilter.java | 4 +- .../analysis/fa/PersianCharFilterFactory.java | 4 +- .../fa/PersianNormalizationFilter.java | 4 +- .../fa/PersianNormalizationFilterFactory.java | 4 +- .../lucene/analysis/fa/PersianNormalizer.java | 4 +- .../lucene/analysis/fa/package-info.java | 1 - .../lucene/analysis/fi/FinnishAnalyzer.java | 4 +- .../analysis/fi/FinnishLightStemFilter.java | 4 +- .../fi/FinnishLightStemFilterFactory.java | 4 +- .../analysis/fi/FinnishLightStemmer.java | 4 +- .../lucene/analysis/fi/package-info.java | 1 - .../lucene/analysis/fr/FrenchAnalyzer.java | 4 +- .../analysis/fr/FrenchLightStemFilter.java | 4 +- .../fr/FrenchLightStemFilterFactory.java | 4 +- .../analysis/fr/FrenchLightStemmer.java | 4 +- .../analysis/fr/FrenchMinimalStemFilter.java | 4 +- .../fr/FrenchMinimalStemFilterFactory.java | 4 +- .../analysis/fr/FrenchMinimalStemmer.java | 4 +- .../lucene/analysis/fr/package-info.java | 1 - .../lucene/analysis/ga/IrishAnalyzer.java | 4 +- .../analysis/ga/IrishLowerCaseFilter.java | 4 +- .../ga/IrishLowerCaseFilterFactory.java | 4 +- .../lucene/analysis/ga/package-info.java | 1 - .../lucene/analysis/gl/GalicianAnalyzer.java | 4 +- .../gl/GalicianMinimalStemFilter.java | 4 +- .../gl/GalicianMinimalStemFilterFactory.java | 4 +- .../analysis/gl/GalicianMinimalStemmer.java | 4 +- .../analysis/gl/GalicianStemFilter.java | 4 +- .../gl/GalicianStemFilterFactory.java | 4 +- .../lucene/analysis/gl/GalicianStemmer.java | 4 +- .../lucene/analysis/gl/package-info.java | 1 - .../lucene/analysis/hi/HindiAnalyzer.java | 4 +- .../analysis/hi/HindiNormalizationFilter.java | 4 +- .../hi/HindiNormalizationFilterFactory.java | 4 +- .../lucene/analysis/hi/HindiNormalizer.java | 4 +- .../lucene/analysis/hi/HindiStemFilter.java | 4 +- .../analysis/hi/HindiStemFilterFactory.java | 4 +- .../lucene/analysis/hi/HindiStemmer.java | 4 +- .../lucene/analysis/hi/package-info.java | 1 - .../lucene/analysis/hu/HungarianAnalyzer.java | 4 +- .../analysis/hu/HungarianLightStemFilter.java | 4 +- .../hu/HungarianLightStemFilterFactory.java | 4 +- .../analysis/hu/HungarianLightStemmer.java | 4 +- .../lucene/analysis/hu/package-info.java | 1 - .../lucene/analysis/hunspell/Dictionary.java | 4 +- .../analysis/hunspell/HunspellStemFilter.java | 4 +- .../hunspell/HunspellStemFilterFactory.java | 4 +- .../analysis/hunspell/ISO8859_14Decoder.java | 4 +- .../lucene/analysis/hunspell/Stemmer.java | 4 +- .../analysis/hunspell/package-info.java | 1 - .../lucene/analysis/hy/ArmenianAnalyzer.java | 4 +- .../lucene/analysis/hy/package-info.java | 1 - .../analysis/id/IndonesianAnalyzer.java | 4 +- .../analysis/id/IndonesianStemFilter.java | 4 +- .../id/IndonesianStemFilterFactory.java | 4 +- .../lucene/analysis/id/IndonesianStemmer.java | 4 +- .../lucene/analysis/id/package-info.java | 1 - .../analysis/in/IndicNormalizationFilter.java | 4 +- .../in/IndicNormalizationFilterFactory.java | 4 +- .../lucene/analysis/in/IndicNormalizer.java | 4 +- .../lucene/analysis/in/package-info.java | 1 - .../lucene/analysis/it/ItalianAnalyzer.java | 4 +- .../analysis/it/ItalianLightStemFilter.java | 4 +- .../it/ItalianLightStemFilterFactory.java | 4 +- .../analysis/it/ItalianLightStemmer.java | 4 +- .../lucene/analysis/it/package-info.java | 1 - .../analysis/lt/LithuanianAnalyzer.java | 4 +- .../lucene/analysis/lt/package-info.java | 1 - .../lucene/analysis/lv/LatvianAnalyzer.java | 4 +- .../lucene/analysis/lv/LatvianStemFilter.java | 4 +- .../analysis/lv/LatvianStemFilterFactory.java | 4 +- .../lucene/analysis/lv/LatvianStemmer.java | 8 +- .../lucene/analysis/lv/package-info.java | 1 - .../miscellaneous/ASCIIFoldingFilter.java | 4 +- .../ASCIIFoldingFilterFactory.java | 4 +- .../miscellaneous/CapitalizationFilter.java | 4 +- .../CapitalizationFilterFactory.java | 4 +- .../miscellaneous/CodepointCountFilter.java | 4 +- .../CodepointCountFilterFactory.java | 4 +- .../miscellaneous/DateRecognizerFilter.java | 4 +- .../DateRecognizerFilterFactory.java | 4 +- .../miscellaneous/EmptyTokenStream.java | 4 +- .../miscellaneous/FingerprintFilter.java | 4 +- .../FingerprintFilterFactory.java | 4 +- .../miscellaneous/HyphenatedWordsFilter.java | 4 +- .../HyphenatedWordsFilterFactory.java | 4 +- .../miscellaneous/KeepWordFilter.java | 1 - .../miscellaneous/KeepWordFilterFactory.java | 4 +- .../miscellaneous/KeywordMarkerFilter.java | 4 +- .../KeywordMarkerFilterFactory.java | 4 +- .../miscellaneous/KeywordRepeatFilter.java | 4 +- .../KeywordRepeatFilterFactory.java | 4 +- .../analysis/miscellaneous/LengthFilter.java | 4 +- .../miscellaneous/LengthFilterFactory.java | 4 +- .../LimitTokenCountAnalyzer.java | 4 +- .../miscellaneous/LimitTokenCountFilter.java | 4 +- .../LimitTokenCountFilterFactory.java | 4 +- .../miscellaneous/LimitTokenOffsetFilter.java | 4 +- .../LimitTokenOffsetFilterFactory.java | 4 +- .../LimitTokenPositionFilter.java | 2 +- .../LimitTokenPositionFilterFactory.java | 2 +- .../PatternKeywordMarkerFilter.java | 4 +- .../PerFieldAnalyzerWrapper.java | 4 +- .../PrefixAndSuffixAwareTokenFilter.java | 4 +- .../miscellaneous/PrefixAwareTokenFilter.java | 4 +- .../RemoveDuplicatesTokenFilter.java | 1 - .../RemoveDuplicatesTokenFilterFactory.java | 4 +- .../ScandinavianFoldingFilter.java | 4 +- .../ScandinavianFoldingFilterFactory.java | 4 +- .../ScandinavianNormalizationFilter.java | 4 +- ...candinavianNormalizationFilterFactory.java | 4 +- .../miscellaneous/SetKeywordMarkerFilter.java | 2 +- .../miscellaneous/StemmerOverrideFilter.java | 4 +- .../StemmerOverrideFilterFactory.java | 4 +- .../analysis/miscellaneous/TrimFilter.java | 1 - .../miscellaneous/TrimFilterFactory.java | 4 +- .../miscellaneous/TruncateTokenFilter.java | 4 +- .../TruncateTokenFilterFactory.java | 4 +- .../miscellaneous/WordDelimiterFilter.java | 3 +- .../WordDelimiterFilterFactory.java | 4 +- .../miscellaneous/WordDelimiterIterator.java | 4 +- .../analysis/miscellaneous/package-info.java | 1 - .../ngram/EdgeNGramFilterFactory.java | 4 +- .../analysis/ngram/EdgeNGramTokenFilter.java | 4 +- .../analysis/ngram/EdgeNGramTokenizer.java | 4 +- .../ngram/EdgeNGramTokenizerFactory.java | 4 +- .../analysis/ngram/NGramFilterFactory.java | 4 +- .../analysis/ngram/NGramTokenFilter.java | 4 +- .../lucene/analysis/ngram/NGramTokenizer.java | 4 +- .../analysis/ngram/NGramTokenizerFactory.java | 4 +- .../lucene/analysis/ngram/package-info.java | 1 - .../lucene/analysis/nl/DutchAnalyzer.java | 4 +- .../lucene/analysis/nl/package-info.java | 1 - .../lucene/analysis/no/NorwegianAnalyzer.java | 4 +- .../analysis/no/NorwegianLightStemFilter.java | 4 +- .../no/NorwegianLightStemFilterFactory.java | 4 +- .../analysis/no/NorwegianLightStemmer.java | 4 +- .../no/NorwegianMinimalStemFilter.java | 4 +- .../no/NorwegianMinimalStemFilterFactory.java | 4 +- .../analysis/no/NorwegianMinimalStemmer.java | 4 +- .../lucene/analysis/no/package-info.java | 1 - .../analysis/path/PathHierarchyTokenizer.java | 2 +- .../path/PathHierarchyTokenizerFactory.java | 4 +- .../path/ReversePathHierarchyTokenizer.java | 2 +- .../lucene/analysis/path/package-info.java | 1 - .../PatternCaptureGroupFilterFactory.java | 4 +- .../PatternCaptureGroupTokenFilter.java | 4 +- .../pattern/PatternReplaceCharFilter.java | 1 - .../PatternReplaceCharFilterFactory.java | 4 +- .../pattern/PatternReplaceFilter.java | 1 - .../pattern/PatternReplaceFilterFactory.java | 4 +- .../analysis/pattern/PatternTokenizer.java | 1 - .../pattern/PatternTokenizerFactory.java | 4 +- .../lucene/analysis/pattern/package-info.java | 1 - .../analysis/payloads/AbstractEncoder.java | 8 +- .../payloads/DelimitedPayloadTokenFilter.java | 2 +- .../DelimitedPayloadTokenFilterFactory.java | 4 +- .../analysis/payloads/FloatEncoder.java | 8 +- .../analysis/payloads/IdentityEncoder.java | 2 +- .../analysis/payloads/IntegerEncoder.java | 2 +- .../payloads/NumericPayloadTokenFilter.java | 2 +- .../NumericPayloadTokenFilterFactory.java | 4 +- .../analysis/payloads/PayloadEncoder.java | 8 +- .../analysis/payloads/PayloadHelper.java | 2 +- .../TokenOffsetPayloadTokenFilter.java | 2 +- .../TokenOffsetPayloadTokenFilterFactory.java | 4 +- .../payloads/TypeAsPayloadTokenFilter.java | 2 +- .../TypeAsPayloadTokenFilterFactory.java | 4 +- .../analysis/payloads/package-info.java | 1 - .../analysis/pt/PortugueseAnalyzer.java | 4 +- .../pt/PortugueseLightStemFilter.java | 4 +- .../pt/PortugueseLightStemFilterFactory.java | 4 +- .../analysis/pt/PortugueseLightStemmer.java | 4 +- .../pt/PortugueseMinimalStemFilter.java | 4 +- .../PortugueseMinimalStemFilterFactory.java | 4 +- .../analysis/pt/PortugueseMinimalStemmer.java | 4 +- .../analysis/pt/PortugueseStemFilter.java | 4 +- .../pt/PortugueseStemFilterFactory.java | 4 +- .../lucene/analysis/pt/PortugueseStemmer.java | 4 +- .../lucene/analysis/pt/RSLPStemmerBase.java | 4 +- .../lucene/analysis/pt/package-info.java | 1 - .../query/QueryAutoStopWordAnalyzer.java | 2 +- .../lucene/analysis/query/package-info.java | 1 - .../analysis/reverse/ReverseStringFilter.java | 1 - .../reverse/ReverseStringFilterFactory.java | 4 +- .../lucene/analysis/reverse/package-info.java | 1 - .../lucene/analysis/ro/RomanianAnalyzer.java | 4 +- .../lucene/analysis/ro/package-info.java | 1 - .../lucene/analysis/ru/RussianAnalyzer.java | 4 +- .../analysis/ru/RussianLightStemFilter.java | 4 +- .../ru/RussianLightStemFilterFactory.java | 4 +- .../analysis/ru/RussianLightStemmer.java | 4 +- .../lucene/analysis/ru/package-info.java | 1 - .../shingle/ShingleAnalyzerWrapper.java | 4 +- .../analysis/shingle/ShingleFilter.java | 4 +- .../shingle/ShingleFilterFactory.java | 4 +- .../lucene/analysis/shingle/package-info.java | 1 - .../analysis/sinks/TeeSinkTokenFilter.java | 4 +- .../lucene/analysis/sinks/package-info.java | 1 - .../analysis/snowball/SnowballFilter.java | 4 +- .../snowball/SnowballPorterFilterFactory.java | 4 +- .../analysis/snowball/package-info.java | 1 - .../sr/SerbianNormalizationFilter.java | 4 +- .../sr/SerbianNormalizationFilterFactory.java | 4 +- .../sr/SerbianNormalizationRegularFilter.java | 4 +- .../lucene/analysis/sr/package-info.java | 1 - .../analysis/standard/ClassicAnalyzer.java | 4 +- .../analysis/standard/ClassicFilter.java | 4 +- .../standard/ClassicFilterFactory.java | 4 +- .../analysis/standard/ClassicTokenizer.java | 1 - .../standard/ClassicTokenizerFactory.java | 4 +- .../standard/ClassicTokenizerImpl.java | 3 +- .../standard/ClassicTokenizerImpl.jflex | 3 +- .../analysis/standard/StandardAnalyzer.java | 4 +- .../analysis/standard/StandardFilter.java | 4 +- .../standard/StandardFilterFactory.java | 4 +- .../analysis/standard/StandardTokenizer.java | 1 - .../standard/StandardTokenizerFactory.java | 4 +- .../standard/StandardTokenizerImpl.java | 3 +- .../standard/StandardTokenizerImpl.jflex | 3 +- .../standard/UAX29URLEmailAnalyzer.java | 4 +- .../standard/UAX29URLEmailTokenizer.java | 4 +- .../UAX29URLEmailTokenizerFactory.java | 4 +- .../standard/UAX29URLEmailTokenizerImpl.java | 3 +- .../standard/UAX29URLEmailTokenizerImpl.jflex | 3 +- .../analysis/standard/package-info.java | 1 - .../lucene/analysis/sv/SwedishAnalyzer.java | 4 +- .../analysis/sv/SwedishLightStemFilter.java | 4 +- .../sv/SwedishLightStemFilterFactory.java | 4 +- .../analysis/sv/SwedishLightStemmer.java | 4 +- .../lucene/analysis/sv/package-info.java | 1 - .../analysis/synonym/SolrSynonymParser.java | 4 +- .../analysis/synonym/SynonymFilter.java | 4 +- .../synonym/SynonymFilterFactory.java | 4 +- .../lucene/analysis/synonym/SynonymMap.java | 4 +- .../synonym/WordnetSynonymParser.java | 4 +- .../lucene/analysis/synonym/package-info.java | 1 - .../lucene/analysis/th/ThaiAnalyzer.java | 14 +-- .../lucene/analysis/th/ThaiTokenizer.java | 4 +- .../analysis/th/ThaiTokenizerFactory.java | 4 +- .../lucene/analysis/th/package-info.java | 1 - .../lucene/analysis/tr/ApostropheFilter.java | 4 +- .../analysis/tr/ApostropheFilterFactory.java | 4 +- .../lucene/analysis/tr/TurkishAnalyzer.java | 4 +- .../analysis/tr/TurkishLowerCaseFilter.java | 4 +- .../tr/TurkishLowerCaseFilterFactory.java | 4 +- .../lucene/analysis/tr/package-info.java | 1 - .../util/AbstractAnalysisFactory.java | 4 +- .../analysis/util/AnalysisSPILoader.java | 4 +- .../analysis/util/CharArrayIterator.java | 4 +- .../lucene/analysis/util/CharArrayMap.java | 4 +- .../lucene/analysis/util/CharArraySet.java | 4 +- .../analysis/util/CharFilterFactory.java | 4 +- .../lucene/analysis/util/CharTokenizer.java | 4 +- .../lucene/analysis/util/CharacterUtils.java | 4 +- .../util/ClasspathResourceLoader.java | 4 +- .../lucene/analysis/util/ElisionFilter.java | 4 +- .../analysis/util/ElisionFilterFactory.java | 4 +- .../util/FilesystemResourceLoader.java | 4 +- .../analysis/util/FilteringTokenFilter.java | 4 +- .../util/MultiTermAwareComponent.java | 4 +- .../analysis/util/OpenStringBuilder.java | 4 +- .../lucene/analysis/util/ResourceLoader.java | 4 +- .../analysis/util/ResourceLoaderAware.java | 1 - .../analysis/util/RollingCharBuffer.java | 4 +- .../util/SegmentingTokenizerBase.java | 4 +- .../lucene/analysis/util/StemmerUtil.java | 4 +- .../analysis/util/StopwordAnalyzerBase.java | 1 - .../analysis/util/TokenFilterFactory.java | 4 +- .../analysis/util/TokenizerFactory.java | 4 +- .../lucene/analysis/util/WordlistLoader.java | 4 +- .../lucene/analysis/util/package-info.java | 1 - .../wikipedia/WikipediaTokenizer.java | 1 - .../wikipedia/WikipediaTokenizerFactory.java | 4 +- .../wikipedia/WikipediaTokenizerImpl.java | 3 +- .../wikipedia/WikipediaTokenizerImpl.jflex | 3 +- .../analysis/wikipedia/package-info.java | 1 - .../collation/CollationAttributeFactory.java | 4 +- .../collation/CollationDocValuesField.java | 4 +- .../collation/CollationKeyAnalyzer.java | 4 +- .../apache/lucene/collation/package-info.java | 1 - .../CollatedTermAttributeImpl.java | 4 +- .../tokenattributes/package-info.java | 1 - .../tartarus/snowball/ext/package-info.java | 1 - .../org/tartarus/snowball/package-info.java | 1 - .../analysis/ar/TestArabicAnalyzer.java | 4 +- .../lucene/analysis/ar/TestArabicFilters.java | 4 +- .../ar/TestArabicNormalizationFilter.java | 4 +- .../analysis/ar/TestArabicStemFilter.java | 4 +- .../analysis/bg/TestBulgarianAnalyzer.java | 4 +- .../bg/TestBulgarianStemFilterFactory.java | 4 +- .../analysis/bg/TestBulgarianStemmer.java | 4 +- .../analysis/br/TestBrazilianAnalyzer.java | 4 +- .../br/TestBrazilianStemFilterFactory.java | 4 +- .../analysis/ca/TestCatalanAnalyzer.java | 4 +- .../charfilter/HTMLStripCharFilterTest.java | 4 +- .../TestHTMLStripCharFilterFactory.java | 4 +- .../charfilter/TestMappingCharFilter.java | 1 - .../TestMappingCharFilterFactory.java | 4 +- .../lucene/analysis/cjk/TestCJKAnalyzer.java | 4 +- .../analysis/cjk/TestCJKBigramFilter.java | 4 +- .../cjk/TestCJKBigramFilterFactory.java | 4 +- .../analysis/cjk/TestCJKWidthFilter.java | 4 +- .../cjk/TestCJKWidthFilterFactory.java | 4 +- .../analysis/ckb/TestSoraniAnalyzer.java | 4 +- .../ckb/TestSoraniNormalizationFilter.java | 4 +- .../TestSoraniNormalizationFilterFactory.java | 4 +- .../analysis/ckb/TestSoraniStemFilter.java | 4 +- .../ckb/TestSoraniStemFilterFactory.java | 4 +- .../TestCommonGramsFilterFactory.java | 4 +- .../TestCommonGramsQueryFilterFactory.java | 4 +- .../compound/TestCompoundWordTokenFilter.java | 4 +- ...tionaryCompoundWordTokenFilterFactory.java | 4 +- ...enationCompoundWordTokenFilterFactory.java | 4 +- .../core/TestAllAnalyzersHaveFactories.java | 4 +- .../lucene/analysis/core/TestAnalyzers.java | 4 +- .../analysis/core/TestBugInSomething.java | 32 +++---- .../analysis/core/TestDecimalDigitFilter.java | 4 +- .../core/TestDecimalDigitFilterFactory.java | 4 +- .../analysis/core/TestDuelingAnalyzers.java | 4 +- .../lucene/analysis/core/TestFactories.java | 4 +- .../analysis/core/TestKeywordAnalyzer.java | 4 +- .../analysis/core/TestRandomChains.java | 4 +- .../analysis/core/TestStopAnalyzer.java | 4 +- .../lucene/analysis/core/TestStopFilter.java | 15 ++-- .../analysis/core/TestStopFilterFactory.java | 4 +- .../analysis/core/TestTypeTokenFilter.java | 4 +- .../core/TestTypeTokenFilterFactory.java | 4 +- .../core/TestUnicodeWhitespaceTokenizer.java | 4 +- .../analysis/custom/TestCustomAnalyzer.java | 4 +- .../lucene/analysis/cz/TestCzechAnalyzer.java | 4 +- .../cz/TestCzechStemFilterFactory.java | 4 +- .../lucene/analysis/cz/TestCzechStemmer.java | 4 +- .../analysis/da/TestDanishAnalyzer.java | 4 +- .../analysis/de/TestGermanAnalyzer.java | 4 +- .../de/TestGermanLightStemFilter.java | 4 +- .../de/TestGermanLightStemFilterFactory.java | 4 +- .../de/TestGermanMinimalStemFilter.java | 4 +- .../TestGermanMinimalStemFilterFactory.java | 4 +- .../de/TestGermanNormalizationFilter.java | 4 +- .../TestGermanNormalizationFilterFactory.java | 4 +- .../analysis/de/TestGermanStemFilter.java | 4 +- .../de/TestGermanStemFilterFactory.java | 4 +- .../lucene/analysis/el/GreekAnalyzerTest.java | 14 +-- .../el/TestGreekLowerCaseFilterFactory.java | 4 +- .../el/TestGreekStemFilterFactory.java | 4 +- .../lucene/analysis/el/TestGreekStemmer.java | 4 +- .../analysis/en/TestEnglishAnalyzer.java | 4 +- .../en/TestEnglishMinimalStemFilter.java | 4 +- .../TestEnglishMinimalStemFilterFactory.java | 4 +- .../analysis/en/TestKStemFilterFactory.java | 4 +- .../lucene/analysis/en/TestKStemmer.java | 4 +- .../analysis/en/TestPorterStemFilter.java | 4 +- .../en/TestPorterStemFilterFactory.java | 4 +- .../analysis/es/TestSpanishAnalyzer.java | 4 +- .../es/TestSpanishLightStemFilter.java | 4 +- .../es/TestSpanishLightStemFilterFactory.java | 4 +- .../analysis/eu/TestBasqueAnalyzer.java | 4 +- .../analysis/fa/TestPersianAnalyzer.java | 4 +- .../analysis/fa/TestPersianCharFilter.java | 4 +- .../fa/TestPersianNormalizationFilter.java | 4 +- ...TestPersianNormalizationFilterFactory.java | 4 +- .../analysis/fi/TestFinnishAnalyzer.java | 4 +- .../fi/TestFinnishLightStemFilter.java | 4 +- .../fi/TestFinnishLightStemFilterFactory.java | 4 +- .../analysis/fr/TestFrenchAnalyzer.java | 4 +- .../fr/TestFrenchLightStemFilter.java | 4 +- .../fr/TestFrenchLightStemFilterFactory.java | 4 +- .../fr/TestFrenchMinimalStemFilter.java | 4 +- .../TestFrenchMinimalStemFilterFactory.java | 4 +- .../lucene/analysis/ga/TestIrishAnalyzer.java | 4 +- .../analysis/ga/TestIrishLowerCaseFilter.java | 4 +- .../ga/TestIrishLowerCaseFilterFactory.java | 4 +- .../analysis/gl/TestGalicianAnalyzer.java | 4 +- .../gl/TestGalicianMinimalStemFilter.java | 4 +- .../TestGalicianMinimalStemFilterFactory.java | 4 +- .../analysis/gl/TestGalicianStemFilter.java | 4 +- .../gl/TestGalicianStemFilterFactory.java | 4 +- .../lucene/analysis/hi/TestHindiAnalyzer.java | 14 +-- .../lucene/analysis/hi/TestHindiFilters.java | 4 +- .../analysis/hi/TestHindiNormalizer.java | 4 +- .../lucene/analysis/hi/TestHindiStemmer.java | 4 +- .../analysis/hu/TestHungarianAnalyzer.java | 4 +- .../hu/TestHungarianLightStemFilter.java | 4 +- .../TestHungarianLightStemFilterFactory.java | 4 +- .../analysis/hunspell/StemmerTestBase.java | 4 +- .../analysis/hunspell/Test64kAffixes.java | 4 +- .../hunspell/TestAllDictionaries.java | 4 +- .../hunspell/TestAllDictionaries2.java | 4 +- .../hunspell/TestAlternateCasing.java | 4 +- .../hunspell/TestCaseInsensitive.java | 4 +- .../analysis/hunspell/TestCaseSensitive.java | 4 +- .../analysis/hunspell/TestCircumfix.java | 4 +- .../analysis/hunspell/TestComplexPrefix.java | 4 +- .../analysis/hunspell/TestCondition.java | 4 +- .../analysis/hunspell/TestCondition2.java | 8 +- .../lucene/analysis/hunspell/TestConv.java | 8 +- .../analysis/hunspell/TestDependencies.java | 4 +- .../analysis/hunspell/TestDictionary.java | 4 +- .../analysis/hunspell/TestDoubleEscape.java | 4 +- .../lucene/analysis/hunspell/TestEscaped.java | 4 +- .../analysis/hunspell/TestFlagLong.java | 4 +- .../lucene/analysis/hunspell/TestFlagNum.java | 4 +- .../analysis/hunspell/TestFullStrip.java | 4 +- .../analysis/hunspell/TestHomonyms.java | 4 +- .../hunspell/TestHunspellStemFilter.java | 4 +- .../TestHunspellStemFilterFactory.java | 4 +- .../lucene/analysis/hunspell/TestIgnore.java | 4 +- .../analysis/hunspell/TestKeepCase.java | 4 +- .../lucene/analysis/hunspell/TestMorph.java | 4 +- .../analysis/hunspell/TestMorphAlias.java | 4 +- .../analysis/hunspell/TestMorphData.java | 4 +- .../analysis/hunspell/TestNeedAffix.java | 4 +- .../analysis/hunspell/TestOnlyInCompound.java | 4 +- .../hunspell/TestOptionalCondition.java | 4 +- .../lucene/analysis/hunspell/TestSpaces.java | 4 +- .../lucene/analysis/hunspell/TestStemmer.java | 4 +- .../hunspell/TestStrangeOvergeneration.java | 4 +- .../lucene/analysis/hunspell/TestTwoFold.java | 4 +- .../analysis/hunspell/TestTwoSuffixes.java | 4 +- .../analysis/hunspell/TestZeroAffix.java | 4 +- .../analysis/hunspell/TestZeroAffix2.java | 4 +- .../analysis/hy/TestArmenianAnalyzer.java | 4 +- .../analysis/id/TestIndonesianAnalyzer.java | 4 +- .../id/TestIndonesianStemFilterFactory.java | 4 +- .../analysis/id/TestIndonesianStemmer.java | 4 +- .../analysis/in/TestIndicNormalizer.java | 4 +- .../analysis/it/TestItalianAnalyzer.java | 4 +- .../it/TestItalianLightStemFilter.java | 4 +- .../it/TestItalianLightStemFilterFactory.java | 4 +- .../analysis/lt/TestLithuanianAnalyzer.java | 4 +- .../analysis/lt/TestLithuanianStemming.java | 4 +- .../analysis/lv/TestLatvianAnalyzer.java | 4 +- .../lv/TestLatvianStemFilterFactory.java | 4 +- .../analysis/lv/TestLatvianStemmer.java | 4 +- .../DateRecognizerFilterFactoryTest.java | 14 +-- .../DateRecognizerFilterTest.java | 14 +-- .../miscellaneous/TestASCIIFoldingFilter.java | 4 +- .../TestCapitalizationFilter.java | 1 - .../TestCapitalizationFilterFactory.java | 4 +- .../TestCodepointCountFilter.java | 4 +- .../TestCodepointCountFilterFactory.java | 4 +- .../miscellaneous/TestEmptyTokenStream.java | 4 +- .../miscellaneous/TestFingerprintFilter.java | 4 +- .../TestFingerprintFilterFactory.java | 4 +- .../TestHyphenatedWordsFilter.java | 1 - .../miscellaneous/TestKeepFilterFactory.java | 4 +- .../miscellaneous/TestKeepWordFilter.java | 1 - .../TestKeywordMarkerFilter.java | 32 +++---- .../TestKeywordMarkerFilterFactory.java | 4 +- .../TestKeywordRepeatFilter.java | 4 +- .../miscellaneous/TestLengthFilter.java | 4 +- .../TestLengthFilterFactory.java | 4 +- .../TestLimitTokenCountAnalyzer.java | 4 +- .../TestLimitTokenCountFilter.java | 4 +- .../TestLimitTokenCountFilterFactory.java | 4 +- .../TestLimitTokenOffsetFilter.java | 4 +- .../TestLimitTokenOffsetFilterFactory.java | 4 +- .../TestLimitTokenPositionFilter.java | 2 +- .../TestLimitTokenPositionFilterFactory.java | 2 +- .../TestPerFieldAnalyzerWrapper.java | 32 +++---- .../TestPrefixAndSuffixAwareTokenFilter.java | 4 +- .../TestPrefixAwareTokenFilter.java | 4 +- .../TestRemoveDuplicatesTokenFilter.java | 1 - ...estRemoveDuplicatesTokenFilterFactory.java | 4 +- .../TestScandinavianFoldingFilter.java | 4 +- .../TestScandinavianFoldingFilterFactory.java | 15 ++-- .../TestScandinavianNormalizationFilter.java | 4 +- ...candinavianNormalizationFilterFactory.java | 18 ++-- .../TestStemmerOverrideFilter.java | 2 +- .../TestStemmerOverrideFilterFactory.java | 4 +- .../miscellaneous/TestTrimFilter.java | 1 - .../miscellaneous/TestTrimFilterFactory.java | 4 +- .../TestTruncateTokenFilter.java | 4 +- .../TestTruncateTokenFilterFactory.java | 4 +- .../TestWordDelimiterFilter.java | 1 - .../ngram/EdgeNGramTokenFilterTest.java | 4 +- .../ngram/EdgeNGramTokenizerTest.java | 4 +- .../analysis/ngram/NGramTokenFilterTest.java | 4 +- .../analysis/ngram/NGramTokenizerTest.java | 4 +- .../analysis/ngram/TestNGramFilters.java | 4 +- .../lucene/analysis/nl/TestDutchAnalyzer.java | 4 +- .../analysis/no/TestNorwegianAnalyzer.java | 4 +- .../no/TestNorwegianLightStemFilter.java | 4 +- .../TestNorwegianLightStemFilterFactory.java | 4 +- .../no/TestNorwegianMinimalStemFilter.java | 4 +- ...TestNorwegianMinimalStemFilterFactory.java | 4 +- .../path/TestPathHierarchyTokenizer.java | 4 +- .../TestReversePathHierarchyTokenizer.java | 4 +- .../TestPatternCaptureGroupTokenFilter.java | 4 +- .../pattern/TestPatternReplaceCharFilter.java | 1 - .../TestPatternReplaceCharFilterFactory.java | 4 +- .../pattern/TestPatternReplaceFilter.java | 1 - .../TestPatternReplaceFilterFactory.java | 4 +- .../pattern/TestPatternTokenizer.java | 1 - .../pattern/TestPatternTokenizerFactory.java | 4 +- .../DelimitedPayloadTokenFilterTest.java | 2 +- .../NumericPayloadTokenFilterTest.java | 14 +-- ...estDelimitedPayloadTokenFilterFactory.java | 4 +- .../TokenOffsetPayloadTokenFilterTest.java | 15 ++-- .../TypeAsPayloadTokenFilterTest.java | 17 ++-- .../analysis/pt/TestPortugueseAnalyzer.java | 4 +- .../pt/TestPortugueseLightStemFilter.java | 4 +- .../TestPortugueseLightStemFilterFactory.java | 4 +- .../pt/TestPortugueseMinimalStemFilter.java | 4 +- ...estPortugueseMinimalStemFilterFactory.java | 4 +- .../analysis/pt/TestPortugueseStemFilter.java | 4 +- .../pt/TestPortugueseStemFilterFactory.java | 4 +- .../query/QueryAutoStopWordAnalyzerTest.java | 2 +- .../reverse/TestReverseStringFilter.java | 1 - .../TestReverseStringFilterFactory.java | 4 +- .../analysis/ro/TestRomanianAnalyzer.java | 4 +- .../analysis/ru/TestRussianAnalyzer.java | 4 +- .../ru/TestRussianLightStemFilter.java | 4 +- .../ru/TestRussianLightStemFilterFactory.java | 4 +- .../shingle/ShingleAnalyzerWrapperTest.java | 4 +- .../analysis/shingle/ShingleFilterTest.java | 4 +- .../shingle/TestShingleFilterFactory.java | 4 +- .../sinks/TestTeeSinkTokenFilter.java | 14 +-- .../analysis/snowball/TestSnowball.java | 4 +- .../TestSnowballPorterFilterFactory.java | 15 ++-- .../analysis/snowball/TestSnowballVocab.java | 4 +- .../sr/TestSerbianNormalizationFilter.java | 4 +- ...TestSerbianNormalizationFilterFactory.java | 4 +- ...TestSerbianNormalizationRegularFilter.java | 4 +- .../standard/TestClassicAnalyzer.java | 4 +- .../standard/TestStandardAnalyzer.java | 4 +- .../standard/TestStandardFactories.java | 4 +- .../standard/TestUAX29URLEmailAnalyzer.java | 4 +- .../standard/TestUAX29URLEmailTokenizer.java | 32 +++---- .../TestUAX29URLEmailTokenizerFactory.java | 4 +- .../standard/WordBreakTestUnicode_6_3_0.java | 4 +- .../analysis/sv/TestSwedishAnalyzer.java | 4 +- .../sv/TestSwedishLightStemFilter.java | 4 +- .../sv/TestSwedishLightStemFilterFactory.java | 4 +- .../synonym/BaseSynonymParserTestCase.java | 4 +- .../synonym/TestMultiWordSynonyms.java | 4 +- .../synonym/TestSolrSynonymParser.java | 4 +- .../synonym/TestSynonymFilterFactory.java | 4 +- .../synonym/TestSynonymMapFilter.java | 1 - .../synonym/TestWordnetSynonymParser.java | 1 - .../lucene/analysis/th/TestThaiAnalyzer.java | 4 +- .../analysis/th/TestThaiTokenizerFactory.java | 4 +- .../analysis/tr/TestApostropheFilter.java | 4 +- .../tr/TestApostropheFilterFactory.java | 4 +- .../analysis/tr/TestTurkishAnalyzer.java | 4 +- .../tr/TestTurkishLowerCaseFilter.java | 4 +- .../tr/TestTurkishLowerCaseFilterFactory.java | 4 +- .../util/BaseTokenStreamFactoryTestCase.java | 4 +- .../util/StringMockResourceLoader.java | 4 +- .../analysis/util/TestAnalysisSPILoader.java | 4 +- .../analysis/util/TestCharArrayIterator.java | 4 +- .../analysis/util/TestCharArrayMap.java | 1 - .../analysis/util/TestCharArraySet.java | 4 +- .../analysis/util/TestCharTokenizers.java | 4 +- .../analysis/util/TestCharacterUtils.java | 4 +- .../lucene/analysis/util/TestElision.java | 4 +- .../util/TestElisionFilterFactory.java | 4 +- .../util/TestFilesystemResourceLoader.java | 4 +- .../analysis/util/TestRollingCharBuffer.java | 4 +- .../util/TestSegmentingTokenizerBase.java | 4 +- .../analysis/util/TestWordlistLoader.java | 4 +- .../TestWikipediaTokenizerFactory.java | 4 +- .../wikipedia/WikipediaTokenizerTest.java | 1 - .../TestCollationDocValuesField.java | 4 +- .../collation/TestCollationKeyAnalyzer.java | 4 +- .../standard/GenerateJflexTLDMacros.java | 16 ++-- .../lucene/analysis/icu/ICUFoldingFilter.java | 4 +- .../analysis/icu/ICUFoldingFilterFactory.java | 4 +- .../icu/ICUNormalizer2CharFilter.java | 4 +- .../icu/ICUNormalizer2CharFilterFactory.java | 4 +- .../analysis/icu/ICUNormalizer2Filter.java | 4 +- .../icu/ICUNormalizer2FilterFactory.java | 4 +- .../analysis/icu/ICUTransformFilter.java | 4 +- .../icu/ICUTransformFilterFactory.java | 4 +- .../lucene/analysis/icu/package-info.java | 1 - .../segmentation/BreakIteratorWrapper.java | 4 +- .../icu/segmentation/CharArrayIterator.java | 4 +- .../segmentation/CompositeBreakIterator.java | 4 +- .../DefaultICUTokenizerConfig.java | 4 +- .../icu/segmentation/ICUTokenizer.java | 4 +- .../icu/segmentation/ICUTokenizerConfig.java | 4 +- .../icu/segmentation/ICUTokenizerFactory.java | 4 +- .../icu/segmentation/ScriptIterator.java | 3 +- .../icu/segmentation/package-info.java | 1 - .../icu/tokenattributes/ScriptAttribute.java | 4 +- .../tokenattributes/ScriptAttributeImpl.java | 4 +- .../icu/tokenattributes/package-info.java | 1 - .../ICUCollationAttributeFactory.java | 4 +- .../collation/ICUCollationDocValuesField.java | 4 +- .../collation/ICUCollationKeyAnalyzer.java | 4 +- .../ICUCollatedTermAttributeImpl.java | 4 +- .../analysis/icu/TestICUFoldingFilter.java | 4 +- .../icu/TestICUFoldingFilterFactory.java | 4 +- .../icu/TestICUNormalizer2CharFilter.java | 4 +- .../TestICUNormalizer2CharFilterFactory.java | 4 +- .../icu/TestICUNormalizer2Filter.java | 4 +- .../icu/TestICUNormalizer2FilterFactory.java | 4 +- .../analysis/icu/TestICUTransformFilter.java | 4 +- .../icu/TestICUTransformFilterFactory.java | 4 +- .../segmentation/TestCharArrayIterator.java | 4 +- .../icu/segmentation/TestICUTokenizer.java | 4 +- .../icu/segmentation/TestICUTokenizerCJK.java | 4 +- .../segmentation/TestICUTokenizerFactory.java | 4 +- .../segmentation/TestWithCJKBigramFilter.java | 4 +- .../TestICUCollationDocValuesField.java | 4 +- .../TestICUCollationKeyAnalyzer.java | 4 +- .../analysis/icu/GenerateUTR30DataFiles.java | 4 +- .../lucene/analysis/icu/RBBIRuleCompiler.java | 4 +- .../lucene/analysis/ja/GraphvizFormatter.java | 4 +- .../lucene/analysis/ja/JapaneseAnalyzer.java | 4 +- .../analysis/ja/JapaneseBaseFormFilter.java | 4 +- .../ja/JapaneseBaseFormFilterFactory.java | 4 +- .../ja/JapaneseIterationMarkCharFilter.java | 4 +- ...apaneseIterationMarkCharFilterFactory.java | 4 +- .../ja/JapaneseKatakanaStemFilter.java | 4 +- .../ja/JapaneseKatakanaStemFilterFactory.java | 4 +- .../analysis/ja/JapaneseNumberFilter.java | 4 +- .../ja/JapaneseNumberFilterFactory.java | 4 +- .../ja/JapanesePartOfSpeechStopFilter.java | 4 +- ...JapanesePartOfSpeechStopFilterFactory.java | 4 +- .../ja/JapaneseReadingFormFilter.java | 4 +- .../ja/JapaneseReadingFormFilterFactory.java | 4 +- .../lucene/analysis/ja/JapaneseTokenizer.java | 4 +- .../analysis/ja/JapaneseTokenizerFactory.java | 4 +- .../org/apache/lucene/analysis/ja/Token.java | 4 +- .../analysis/ja/dict/BinaryDictionary.java | 4 +- .../analysis/ja/dict/CharacterDefinition.java | 4 +- .../analysis/ja/dict/ConnectionCosts.java | 4 +- .../lucene/analysis/ja/dict/Dictionary.java | 4 +- .../analysis/ja/dict/TokenInfoDictionary.java | 4 +- .../lucene/analysis/ja/dict/TokenInfoFST.java | 4 +- .../analysis/ja/dict/UnknownDictionary.java | 4 +- .../analysis/ja/dict/UserDictionary.java | 4 +- .../lucene/analysis/ja/dict/package-info.java | 1 - .../lucene/analysis/ja/package-info.java | 1 - .../ja/tokenattributes/BaseFormAttribute.java | 4 +- .../BaseFormAttributeImpl.java | 4 +- .../tokenattributes/InflectionAttribute.java | 4 +- .../InflectionAttributeImpl.java | 4 +- .../PartOfSpeechAttribute.java | 4 +- .../PartOfSpeechAttributeImpl.java | 4 +- .../ja/tokenattributes/ReadingAttribute.java | 4 +- .../tokenattributes/ReadingAttributeImpl.java | 4 +- .../ja/tokenattributes/package-info.java | 1 - .../lucene/analysis/ja/util/CSVUtil.java | 4 +- .../lucene/analysis/ja/util/ToStringUtil.java | 4 +- .../lucene/analysis/ja/util/package-info.java | 1 - .../analysis/ja/StringMockResourceLoader.java | 4 +- .../lucene/analysis/ja/TestExtendedMode.java | 4 +- .../analysis/ja/TestJapaneseAnalyzer.java | 4 +- .../ja/TestJapaneseBaseFormFilter.java | 4 +- .../ja/TestJapaneseBaseFormFilterFactory.java | 4 +- .../TestJapaneseIterationMarkCharFilter.java | 4 +- ...apaneseIterationMarkCharFilterFactory.java | 4 +- .../ja/TestJapaneseKatakanaStemFilter.java | 4 +- ...TestJapaneseKatakanaStemFilterFactory.java | 4 +- .../analysis/ja/TestJapaneseNumberFilter.java | 4 +- .../ja/TestJapaneseNumberFilterFactory.java | 4 +- ...JapanesePartOfSpeechStopFilterFactory.java | 4 +- .../ja/TestJapaneseReadingFormFilter.java | 4 +- .../TestJapaneseReadingFormFilterFactory.java | 4 +- .../analysis/ja/TestJapaneseTokenizer.java | 4 +- .../ja/TestJapaneseTokenizerFactory.java | 4 +- .../lucene/analysis/ja/TestSearchMode.java | 4 +- .../ja/dict/TestTokenInfoDictionary.java | 4 +- .../analysis/ja/dict/UserDictionaryTest.java | 4 +- .../analysis/ja/util/TestToStringUtil.java | 4 +- .../ja/util/BinaryDictionaryWriter.java | 4 +- .../ja/util/CharacterDefinitionWriter.java | 4 +- .../ja/util/ConnectionCostsBuilder.java | 4 +- .../ja/util/ConnectionCostsWriter.java | 4 +- .../analysis/ja/util/DictionaryBuilder.java | 4 +- .../ja/util/TokenInfoDictionaryBuilder.java | 4 +- .../ja/util/TokenInfoDictionaryWriter.java | 4 +- .../ja/util/UnknownDictionaryBuilder.java | 4 +- .../ja/util/UnknownDictionaryWriter.java | 4 +- .../ja/dict/UnknownDictionaryTest.java | 4 +- .../morfologik/MorfologikAnalyzer.java | 3 +- .../analysis/morfologik/MorfologikFilter.java | 4 +- .../morfologik/MorfologikFilterFactory.java | 4 +- .../MorphosyntacticTagsAttribute.java | 3 +- .../MorphosyntacticTagsAttributeImpl.java | 3 +- .../analysis/morfologik/package-info.java | 1 - .../morfologik/TestMorfologikAnalyzer.java | 4 +- .../TestMorfologikFilterFactory.java | 4 +- .../analysis/phonetic/BeiderMorseFilter.java | 4 +- .../phonetic/BeiderMorseFilterFactory.java | 4 +- .../phonetic/DaitchMokotoffSoundexFilter.java | 2 +- .../DaitchMokotoffSoundexFilterFactory.java | 2 +- .../DoubleMetaphoneFilterFactory.java | 4 +- .../analysis/phonetic/PhoneticFilter.java | 1 - .../phonetic/PhoneticFilterFactory.java | 4 +- .../analysis/phonetic/package-info.java | 1 - .../phonetic/TestBeiderMorseFilter.java | 4 +- .../TestBeiderMorseFilterFactory.java | 4 +- .../TestDaitchMokotoffSoundexFilter.java | 2 +- ...estDaitchMokotoffSoundexFilterFactory.java | 4 +- .../TestDoubleMetaphoneFilterFactory.java | 4 +- .../analysis/phonetic/TestPhoneticFilter.java | 1 - .../phonetic/TestPhoneticFilterFactory.java | 4 +- .../analysis/cn/smart/AnalyzerProfile.java | 1 - .../lucene/analysis/cn/smart/CharType.java | 1 - .../cn/smart/HMMChineseTokenizer.java | 4 +- .../cn/smart/HMMChineseTokenizerFactory.java | 1 - .../cn/smart/SmartChineseAnalyzer.java | 1 - .../lucene/analysis/cn/smart/Utility.java | 1 - .../analysis/cn/smart/WordSegmenter.java | 1 - .../lucene/analysis/cn/smart/WordType.java | 1 - .../cn/smart/hhmm/AbstractDictionary.java | 1 - .../analysis/cn/smart/hhmm/BiSegGraph.java | 1 - .../cn/smart/hhmm/BigramDictionary.java | 1 - .../analysis/cn/smart/hhmm/HHMMSegmenter.java | 1 - .../analysis/cn/smart/hhmm/PathNode.java | 1 - .../analysis/cn/smart/hhmm/SegGraph.java | 1 - .../analysis/cn/smart/hhmm/SegToken.java | 1 - .../cn/smart/hhmm/SegTokenFilter.java | 1 - .../analysis/cn/smart/hhmm/SegTokenPair.java | 1 - .../cn/smart/hhmm/WordDictionary.java | 1 - .../analysis/cn/smart/hhmm/package-info.java | 1 - .../analysis/cn/smart/package-info.java | 1 - .../smart/TestHMMChineseTokenizerFactory.java | 4 +- .../cn/smart/TestSmartChineseAnalyzer.java | 1 - .../lucene/analysis/pl/PolishAnalyzer.java | 4 +- .../lucene/analysis/pl/package-info.java | 1 - .../analysis/stempel/StempelFilter.java | 26 +++--- .../StempelPolishStemFilterFactory.java | 4 +- .../analysis/stempel/StempelStemmer.java | 26 +++--- .../lucene/analysis/stempel/package-info.java | 1 - .../org/egothor/stemmer/package-info.java | 1 - .../analysis/pl/TestPolishAnalyzer.java | 4 +- .../TestStempelPolishStemFilterFactory.java | 4 +- .../analysis/uima/BaseUIMATokenizer.java | 4 +- .../uima/UIMAAnnotationsTokenizer.java | 4 +- .../uima/UIMAAnnotationsTokenizerFactory.java | 4 +- .../analysis/uima/UIMABaseAnalyzer.java | 4 +- .../analysis/uima/UIMATypeAwareAnalyzer.java | 4 +- .../UIMATypeAwareAnnotationsTokenizer.java | 4 +- ...ATypeAwareAnnotationsTokenizerFactory.java | 4 +- .../lucene/analysis/uima/ae/AEProvider.java | 4 +- .../analysis/uima/ae/AEProviderFactory.java | 4 +- .../analysis/uima/ae/BasicAEProvider.java | 4 +- .../uima/ae/OverridingParamsAEProvider.java | 4 +- .../lucene/analysis/uima/ae/package-info.java | 1 - .../lucene/analysis/uima/package-info.java | 1 - .../analysis/uima/UIMABaseAnalyzerTest.java | 4 +- .../uima/UIMATypeAwareAnalyzerTest.java | 4 +- .../uima/ae/AEProviderFactoryTest.java | 4 +- .../analysis/uima/ae/BasicAEProviderTest.java | 4 +- .../ae/OverridingParamsAEProviderTest.java | 4 +- .../uima/an/SampleEntityAnnotator.java | 4 +- .../analysis/uima/an/SamplePoSTagger.java | 4 +- .../uima/an/SampleWSTokenizerAnnotator.java | 4 +- .../org/apache/lucene/codecs/Placeholder.java | 4 +- .../lucene/codecs/lucene50/Lucene50Codec.java | 4 +- .../lucene50/Lucene50DocValuesConsumer.java | 4 +- .../lucene50/Lucene50DocValuesFormat.java | 4 +- .../lucene50/Lucene50DocValuesProducer.java | 4 +- .../codecs/lucene50/Lucene50NormsFormat.java | 4 +- .../lucene50/Lucene50NormsProducer.java | 4 +- .../lucene/codecs/lucene53/Lucene53Codec.java | 4 +- .../lucene/codecs/lucene54/Lucene54Codec.java | 4 +- .../lucene50/Lucene50NormsConsumer.java | 4 +- .../codecs/lucene50/Lucene50RWCodec.java | 4 +- .../lucene50/Lucene50RWNormsFormat.java | 4 +- .../lucene50/TestLucene50DocValuesFormat.java | 4 +- .../lucene50/TestLucene50NormsFormat.java | 4 +- .../index/TestBackwardsCompatibility.java | 4 +- .../index/TestMaxPositionInOldIndex.java | 4 +- .../apache/lucene/benchmark/Constants.java | 19 ++-- .../lucene/benchmark/byTask/Benchmark.java | 4 +- .../lucene/benchmark/byTask/PerfRunData.java | 4 +- .../byTask/feeds/AbstractQueryMaker.java | 13 +-- .../byTask/feeds/ContentItemsSource.java | 4 +- .../benchmark/byTask/feeds/ContentSource.java | 4 +- .../byTask/feeds/DemoHTMLParser.java | 4 +- .../byTask/feeds/DirContentSource.java | 4 +- .../benchmark/byTask/feeds/DocData.java | 4 +- .../benchmark/byTask/feeds/DocMaker.java | 4 +- .../byTask/feeds/EnwikiContentSource.java | 4 +- .../byTask/feeds/EnwikiQueryMaker.java | 4 +- .../benchmark/byTask/feeds/FacetSource.java | 4 +- .../byTask/feeds/FileBasedQueryMaker.java | 18 ++-- .../byTask/feeds/GeonamesLineParser.java | 4 +- .../benchmark/byTask/feeds/HTMLParser.java | 4 +- .../benchmark/byTask/feeds/LineDocSource.java | 4 +- .../feeds/LongToEnglishContentSource.java | 4 +- .../byTask/feeds/LongToEnglishQueryMaker.java | 4 +- .../byTask/feeds/NoMoreDataException.java | 4 +- .../benchmark/byTask/feeds/QueryMaker.java | 4 +- .../byTask/feeds/RandomFacetSource.java | 4 +- .../byTask/feeds/ReutersContentSource.java | 4 +- .../byTask/feeds/ReutersQueryMaker.java | 4 +- .../byTask/feeds/SimpleQueryMaker.java | 4 +- .../feeds/SimpleSloppyPhraseQueryMaker.java | 4 +- .../byTask/feeds/SingleDocSource.java | 8 +- .../byTask/feeds/SortableSingleDocSource.java | 4 +- .../byTask/feeds/SpatialDocMaker.java | 4 +- .../byTask/feeds/SpatialFileQueryMaker.java | 4 +- .../byTask/feeds/TrecContentSource.java | 4 +- .../benchmark/byTask/feeds/TrecDocParser.java | 4 +- .../byTask/feeds/TrecFBISParser.java | 4 +- .../byTask/feeds/TrecFR94Parser.java | 4 +- .../benchmark/byTask/feeds/TrecFTParser.java | 4 +- .../byTask/feeds/TrecGov2Parser.java | 4 +- .../byTask/feeds/TrecLATimesParser.java | 4 +- .../byTask/feeds/TrecParserByPath.java | 4 +- .../benchmark/byTask/feeds/package-info.java | 1 - .../lucene/benchmark/byTask/package-info.java | 1 - .../benchmark/byTask/programmatic/Sample.java | 15 ++-- .../byTask/programmatic/package-info.java | 1 - .../lucene/benchmark/byTask/stats/Points.java | 4 +- .../lucene/benchmark/byTask/stats/Report.java | 4 +- .../benchmark/byTask/stats/TaskStats.java | 4 +- .../benchmark/byTask/stats/package-info.java | 1 - .../benchmark/byTask/tasks/AddDocTask.java | 4 +- .../byTask/tasks/AddFacetedDocTask.java | 4 +- .../byTask/tasks/AddIndexesTask.java | 4 +- .../byTask/tasks/AnalyzerFactoryTask.java | 4 +- .../byTask/tasks/BenchmarkHighlighter.java | 4 +- .../byTask/tasks/ClearStatsTask.java | 8 +- .../byTask/tasks/CloseIndexTask.java | 4 +- .../byTask/tasks/CloseReaderTask.java | 4 +- .../byTask/tasks/CloseTaxonomyIndexTask.java | 4 +- .../byTask/tasks/CloseTaxonomyReaderTask.java | 4 +- .../byTask/tasks/CommitIndexTask.java | 4 +- .../byTask/tasks/CommitTaxonomyIndexTask.java | 2 +- .../tasks/ConsumeContentSourceTask.java | 4 +- .../byTask/tasks/CreateIndexTask.java | 4 +- .../byTask/tasks/CreateTaxonomyIndexTask.java | 4 +- .../byTask/tasks/ForceMergeTask.java | 4 +- .../byTask/tasks/NearRealtimeReaderTask.java | 4 +- .../byTask/tasks/NewAnalyzerTask.java | 13 +-- .../tasks/NewCollationAnalyzerTask.java | 4 +- .../benchmark/byTask/tasks/NewLocaleTask.java | 4 +- .../benchmark/byTask/tasks/NewRoundTask.java | 8 +- .../benchmark/byTask/tasks/OpenIndexTask.java | 4 +- .../byTask/tasks/OpenReaderTask.java | 4 +- .../byTask/tasks/OpenTaxonomyIndexTask.java | 4 +- .../byTask/tasks/OpenTaxonomyReaderTask.java | 4 +- .../benchmark/byTask/tasks/PerfTask.java | 4 +- .../byTask/tasks/PrintReaderTask.java | 4 +- .../benchmark/byTask/tasks/ReadTask.java | 4 +- .../byTask/tasks/ReadTokensTask.java | 4 +- .../byTask/tasks/ReopenReaderTask.java | 2 +- .../benchmark/byTask/tasks/RepAllTask.java | 4 +- .../byTask/tasks/RepSelectByPrefTask.java | 4 +- .../byTask/tasks/RepSumByNameRoundTask.java | 4 +- .../byTask/tasks/RepSumByNameTask.java | 4 +- .../byTask/tasks/RepSumByPrefRoundTask.java | 4 +- .../byTask/tasks/RepSumByPrefTask.java | 4 +- .../benchmark/byTask/tasks/ReportTask.java | 18 ++-- .../byTask/tasks/ResetInputsTask.java | 8 +- .../byTask/tasks/ResetSystemEraseTask.java | 8 +- .../byTask/tasks/ResetSystemSoftTask.java | 8 +- .../byTask/tasks/RollbackIndexTask.java | 4 +- .../benchmark/byTask/tasks/SearchTask.java | 4 +- .../tasks/SearchTravRetHighlightTask.java | 4 +- .../SearchTravRetLoadFieldSelectorTask.java | 14 +-- .../byTask/tasks/SearchTravRetTask.java | 4 +- .../SearchTravRetVectorHighlightTask.java | 4 +- .../byTask/tasks/SearchTravTask.java | 4 +- .../byTask/tasks/SearchWithCollectorTask.java | 2 +- .../byTask/tasks/SearchWithSortTask.java | 2 +- .../benchmark/byTask/tasks/SetPropTask.java | 8 +- .../benchmark/byTask/tasks/TaskSequence.java | 4 +- .../benchmark/byTask/tasks/UpdateDocTask.java | 4 +- .../benchmark/byTask/tasks/WaitTask.java | 4 +- .../benchmark/byTask/tasks/WarmTask.java | 4 +- .../byTask/tasks/WriteEnwikiLineDocTask.java | 32 +++---- .../byTask/tasks/WriteLineDocTask.java | 4 +- .../benchmark/byTask/tasks/package-info.java | 1 - .../benchmark/byTask/utils/Algorithm.java | 4 +- .../byTask/utils/AnalyzerFactory.java | 4 +- .../lucene/benchmark/byTask/utils/Config.java | 4 +- .../lucene/benchmark/byTask/utils/Format.java | 4 +- .../benchmark/byTask/utils/StreamUtils.java | 4 +- .../benchmark/byTask/utils/package-info.java | 1 - .../apache/lucene/benchmark/package-info.java | 1 - .../benchmark/quality/package-info.java | 1 - .../benchmark/quality/trec/QueryDriver.java | 4 +- .../benchmark/quality/trec/package-info.java | 1 - .../benchmark/quality/utils/package-info.java | 1 - .../benchmark/utils/ExtractReuters.java | 15 ++-- .../benchmark/utils/ExtractWikipedia.java | 4 +- .../lucene/benchmark/utils/package-info.java | 1 - .../benchmark/src/test/conf/ConfLoader.java | 3 +- .../lucene/benchmark/BenchmarkTestCase.java | 4 +- .../benchmark/byTask/TestPerfTasksLogic.java | 1 - .../benchmark/byTask/TestPerfTasksParse.java | 1 - .../benchmark/byTask/feeds/DocMakerTest.java | 4 +- .../byTask/feeds/EnwikiContentSourceTest.java | 4 +- .../byTask/feeds/LineDocSourceTest.java | 4 +- .../byTask/feeds/TestHtmlParser.java | 4 +- .../byTask/feeds/TrecContentSourceTest.java | 4 +- .../byTask/tasks/AddIndexesTaskTest.java | 4 +- .../byTask/tasks/CommitIndexTaskTest.java | 4 +- .../tasks/CountingHighlighterTestTask.java | 1 - .../byTask/tasks/CountingSearchTestTask.java | 1 - .../byTask/tasks/CreateIndexTaskTest.java | 4 +- .../benchmark/byTask/tasks/PerfTaskTest.java | 4 +- .../byTask/tasks/SearchWithSortTaskTest.java | 4 +- .../tasks/WriteEnwikiLineDocTaskTest.java | 4 +- .../byTask/tasks/WriteLineDocTaskTest.java | 4 +- .../byTask/tasks/alt/AltPackageTaskTest.java | 4 +- .../byTask/tasks/alt/AltTestTask.java | 4 +- .../byTask/utils/StreamUtilsTest.java | 4 +- .../benchmark/byTask/utils/TestConfig.java | 4 +- .../benchmark/quality/TestQualityRun.java | 4 +- .../CachingNaiveBayesClassifier.java | 32 +++---- .../document/DocumentClassifier.java | 4 +- .../KNearestNeighborDocumentClassifier.java | 4 +- .../SimpleNaiveBayesDocumentClassifier.java | 4 +- .../classification/document/package-info.java | 1 - .../lucene/classification/package-info.java | 1 - .../utils/ConfusionMatrixGenerator.java | 4 +- .../classification/utils/DatasetSplitter.java | 4 +- .../classification/utils/package-info.java | 1 - .../CachingNaiveBayesClassifierTest.java | 4 +- .../DocumentClassificationTestBase.java | 4 +- ...NearestNeighborDocumentClassifierTest.java | 4 +- ...impleNaiveBayesDocumentClassifierTest.java | 4 +- .../utils/ConfusionMatrixGeneratorTest.java | 4 +- .../utils/DataSplitterTest.java | 4 +- .../autoprefix/AutoPrefixPostingsFormat.java | 4 +- .../codecs/autoprefix/package-info.java | 1 - .../codecs/blockterms/BlockTermsReader.java | 4 +- .../codecs/blockterms/BlockTermsWriter.java | 4 +- .../blockterms/FixedGapTermsIndexReader.java | 4 +- .../blockterms/FixedGapTermsIndexWriter.java | 4 +- .../blockterms/TermsIndexReaderBase.java | 4 +- .../blockterms/TermsIndexWriterBase.java | 4 +- .../VariableGapTermsIndexReader.java | 4 +- .../VariableGapTermsIndexWriter.java | 4 +- .../codecs/blockterms/package-info.java | 1 - .../BlockTreeOrdsPostingsFormat.java | 4 +- .../codecs/blocktreeords/FSTOrdsOutputs.java | 4 +- .../OrdsBlockTreeTermsReader.java | 4 +- .../OrdsBlockTreeTermsWriter.java | 4 +- .../codecs/blocktreeords/OrdsFieldReader.java | 4 +- .../blocktreeords/OrdsIntersectTermsEnum.java | 4 +- .../OrdsIntersectTermsEnumFrame.java | 4 +- .../blocktreeords/OrdsSegmentTermsEnum.java | 4 +- .../OrdsSegmentTermsEnumFrame.java | 4 +- .../codecs/blocktreeords/package-info.java | 1 - .../codecs/bloom/BloomFilterFactory.java | 2 +- .../bloom/BloomFilteringPostingsFormat.java | 4 +- .../bloom/DefaultBloomFilterFactory.java | 2 +- .../apache/lucene/codecs/bloom/FuzzySet.java | 4 +- .../lucene/codecs/bloom/HashFunction.java | 2 +- .../lucene/codecs/bloom/MurmurHash2.java | 2 +- .../lucene/codecs/bloom/package-info.java | 1 - .../memory/DirectDocValuesConsumer.java | 4 +- .../codecs/memory/DirectDocValuesFormat.java | 4 +- .../memory/DirectDocValuesProducer.java | 4 +- .../codecs/memory/DirectPostingsFormat.java | 4 +- .../codecs/memory/FSTOrdPostingsFormat.java | 6 +- .../codecs/memory/FSTOrdTermsReader.java | 4 +- .../codecs/memory/FSTOrdTermsWriter.java | 4 +- .../codecs/memory/FSTPostingsFormat.java | 6 +- .../lucene/codecs/memory/FSTTermOutputs.java | 4 +- .../lucene/codecs/memory/FSTTermsReader.java | 4 +- .../lucene/codecs/memory/FSTTermsWriter.java | 4 +- .../memory/MemoryDocValuesConsumer.java | 4 +- .../codecs/memory/MemoryDocValuesFormat.java | 4 +- .../memory/MemoryDocValuesProducer.java | 4 +- .../codecs/memory/MemoryPostingsFormat.java | 4 +- .../lucene/codecs/memory/package-info.java | 1 - .../simpletext/SimpleTextBKDReader.java | 4 +- .../codecs/simpletext/SimpleTextCodec.java | 4 +- .../simpletext/SimpleTextCompoundFormat.java | 4 +- .../simpletext/SimpleTextDocValuesFormat.java | 4 +- .../simpletext/SimpleTextDocValuesReader.java | 4 +- .../simpletext/SimpleTextDocValuesWriter.java | 4 +- .../SimpleTextFieldInfosFormat.java | 4 +- .../simpletext/SimpleTextFieldsReader.java | 4 +- .../simpletext/SimpleTextFieldsWriter.java | 4 +- .../simpletext/SimpleTextLiveDocsFormat.java | 4 +- .../simpletext/SimpleTextNormsFormat.java | 4 +- .../simpletext/SimpleTextPointFormat.java | 4 +- .../simpletext/SimpleTextPointReader.java | 4 +- .../simpletext/SimpleTextPointWriter.java | 4 +- .../simpletext/SimpleTextPostingsFormat.java | 4 +- .../SimpleTextSegmentInfoFormat.java | 4 +- .../SimpleTextStoredFieldsFormat.java | 4 +- .../SimpleTextStoredFieldsReader.java | 4 +- .../SimpleTextStoredFieldsWriter.java | 4 +- .../SimpleTextTermVectorsFormat.java | 4 +- .../SimpleTextTermVectorsReader.java | 4 +- .../SimpleTextTermVectorsWriter.java | 4 +- .../codecs/simpletext/SimpleTextUtil.java | 4 +- .../codecs/simpletext/package-info.java | 1 - .../TestAutoPrefixPostingsFormat.java | 4 +- .../autoprefix/TestAutoPrefixTerms.java | 4 +- .../TestFixedGapPostingsFormat.java | 4 +- ...stVarGapDocFreqIntervalPostingsFormat.java | 4 +- ...TestVarGapFixedIntervalPostingsFormat.java | 4 +- .../blocktreeords/TestOrdsBlockTree.java | 4 +- .../codecs/bloom/TestBloomPostingsFormat.java | 4 +- .../memory/TestDirectDocValuesFormat.java | 4 +- .../memory/TestDirectPostingsFormat.java | 4 +- .../memory/TestFSTOrdPostingsFormat.java | 4 +- .../codecs/memory/TestFSTPostingsFormat.java | 4 +- .../memory/TestMemoryDocValuesFormat.java | 4 +- .../memory/TestMemoryPostingsFormat.java | 4 +- .../TestSimpleTextCompoundFormat.java | 4 +- .../TestSimpleTextDocValuesFormat.java | 4 +- .../TestSimpleTextFieldInfoFormat.java | 4 +- .../simpletext/TestSimpleTextNormsFormat.java | 4 +- .../simpletext/TestSimpleTextPointFormat.java | 4 +- .../TestSimpleTextPostingsFormat.java | 4 +- .../TestSimpleTextSegmentInfoFormat.java | 4 +- .../TestSimpleTextStoredFieldsFormat.java | 4 +- .../TestSimpleTextTermVectorsFormat.java | 4 +- .../java/org/apache/lucene/LucenePackage.java | 4 +- .../org/apache/lucene/analysis/Analyzer.java | 4 +- .../lucene/analysis/AnalyzerWrapper.java | 4 +- .../lucene/analysis/CachingTokenFilter.java | 4 +- .../apache/lucene/analysis/CharFilter.java | 4 +- .../analysis/DelegatingAnalyzerWrapper.java | 8 +- .../analysis/LegacyNumericTokenStream.java | 4 +- .../lucene/analysis/ReusableStringReader.java | 8 +- .../org/apache/lucene/analysis/Token.java | 4 +- .../apache/lucene/analysis/TokenFilter.java | 4 +- .../apache/lucene/analysis/TokenStream.java | 4 +- .../analysis/TokenStreamToAutomaton.java | 4 +- .../org/apache/lucene/analysis/Tokenizer.java | 4 +- .../apache/lucene/analysis/package-info.java | 1 - .../tokenattributes/BytesTermAttribute.java | 4 +- .../BytesTermAttributeImpl.java | 4 +- .../tokenattributes/CharTermAttribute.java | 4 +- .../CharTermAttributeImpl.java | 4 +- .../tokenattributes/FlagsAttribute.java | 4 +- .../tokenattributes/FlagsAttributeImpl.java | 4 +- .../tokenattributes/KeywordAttribute.java | 4 +- .../tokenattributes/KeywordAttributeImpl.java | 4 +- .../tokenattributes/OffsetAttribute.java | 4 +- .../tokenattributes/OffsetAttributeImpl.java | 4 +- .../PackedTokenAttributeImpl.java | 4 +- .../tokenattributes/PayloadAttribute.java | 4 +- .../tokenattributes/PayloadAttributeImpl.java | 4 +- .../PositionIncrementAttribute.java | 4 +- .../PositionIncrementAttributeImpl.java | 4 +- .../PositionLengthAttribute.java | 4 +- .../PositionLengthAttributeImpl.java | 4 +- .../TermToBytesRefAttribute.java | 4 +- .../tokenattributes/TypeAttribute.java | 4 +- .../tokenattributes/TypeAttributeImpl.java | 4 +- .../tokenattributes/package-info.java | 1 - .../apache/lucene/codecs/BlockTermState.java | 2 +- .../java/org/apache/lucene/codecs/Codec.java | 4 +- .../org/apache/lucene/codecs/CodecUtil.java | 4 +- .../apache/lucene/codecs/CompoundFormat.java | 4 +- .../lucene/codecs/DocValuesConsumer.java | 4 +- .../apache/lucene/codecs/DocValuesFormat.java | 4 +- .../lucene/codecs/DocValuesProducer.java | 4 +- .../lucene/codecs/FieldInfosFormat.java | 4 +- .../apache/lucene/codecs/FieldsConsumer.java | 4 +- .../apache/lucene/codecs/FieldsProducer.java | 4 +- .../org/apache/lucene/codecs/FilterCodec.java | 4 +- .../apache/lucene/codecs/LiveDocsFormat.java | 4 +- .../codecs/MultiLevelSkipListReader.java | 4 +- .../codecs/MultiLevelSkipListWriter.java | 4 +- .../apache/lucene/codecs/NormsConsumer.java | 4 +- .../org/apache/lucene/codecs/NormsFormat.java | 4 +- .../apache/lucene/codecs/NormsProducer.java | 18 ++-- .../org/apache/lucene/codecs/PointFormat.java | 4 +- .../org/apache/lucene/codecs/PointReader.java | 4 +- .../org/apache/lucene/codecs/PointWriter.java | 4 +- .../apache/lucene/codecs/PostingsFormat.java | 4 +- .../lucene/codecs/PostingsReaderBase.java | 4 +- .../lucene/codecs/PostingsWriterBase.java | 4 +- .../lucene/codecs/PushPostingsWriterBase.java | 4 +- .../lucene/codecs/SegmentInfoFormat.java | 4 +- .../lucene/codecs/StoredFieldsFormat.java | 4 +- .../lucene/codecs/StoredFieldsReader.java | 24 ++--- .../lucene/codecs/StoredFieldsWriter.java | 24 ++--- .../org/apache/lucene/codecs/TermStats.java | 4 +- .../lucene/codecs/TermVectorsFormat.java | 4 +- .../lucene/codecs/TermVectorsReader.java | 4 +- .../lucene/codecs/TermVectorsWriter.java | 4 +- .../blocktree/AutoPrefixTermsWriter.java | 4 +- .../codecs/blocktree/BitSetPostingsEnum.java | 4 +- .../codecs/blocktree/BitSetTermsEnum.java | 4 +- .../blocktree/BlockTreeTermsReader.java | 4 +- .../blocktree/BlockTreeTermsWriter.java | 4 +- .../lucene/codecs/blocktree/FieldReader.java | 4 +- .../codecs/blocktree/IntersectTermsEnum.java | 4 +- .../blocktree/IntersectTermsEnumFrame.java | 4 +- .../codecs/blocktree/SegmentTermsEnum.java | 4 +- .../blocktree/SegmentTermsEnumFrame.java | 4 +- .../apache/lucene/codecs/blocktree/Stats.java | 4 +- .../lucene/codecs/blocktree/package-info.java | 1 - .../CompressingStoredFieldsFormat.java | 4 +- .../CompressingStoredFieldsIndexReader.java | 4 +- .../CompressingStoredFieldsIndexWriter.java | 4 +- .../CompressingStoredFieldsReader.java | 4 +- .../CompressingStoredFieldsWriter.java | 4 +- .../CompressingTermVectorsFormat.java | 4 +- .../CompressingTermVectorsReader.java | 4 +- .../CompressingTermVectorsWriter.java | 4 +- .../codecs/compressing/CompressionMode.java | 4 +- .../lucene/codecs/compressing/Compressor.java | 4 +- .../codecs/compressing/Decompressor.java | 4 +- .../GrowableByteArrayDataOutput.java | 4 +- .../apache/lucene/codecs/compressing/LZ4.java | 4 +- .../codecs/compressing/MatchingReaders.java | 4 +- .../codecs/compressing/package-info.java | 3 +- .../lucene/codecs/lucene50/ForUtil.java | 2 +- .../lucene50/Lucene50CompoundFormat.java | 4 +- .../lucene50/Lucene50CompoundReader.java | 4 +- .../lucene50/Lucene50FieldInfosFormat.java | 4 +- .../lucene50/Lucene50LiveDocsFormat.java | 4 +- .../lucene50/Lucene50PostingsFormat.java | 6 +- .../lucene50/Lucene50PostingsReader.java | 4 +- .../lucene50/Lucene50PostingsWriter.java | 4 +- .../lucene50/Lucene50SegmentInfoFormat.java | 4 +- .../codecs/lucene50/Lucene50SkipReader.java | 4 +- .../codecs/lucene50/Lucene50SkipWriter.java | 4 +- .../lucene50/Lucene50StoredFieldsFormat.java | 4 +- .../lucene50/Lucene50TermVectorsFormat.java | 4 +- .../lucene/codecs/lucene50/package-info.java | 1 - .../lucene53/Lucene53NormsConsumer.java | 4 +- .../codecs/lucene53/Lucene53NormsFormat.java | 4 +- .../lucene53/Lucene53NormsProducer.java | 4 +- .../lucene/codecs/lucene53/package-info.java | 1 - .../lucene54/Lucene54DocValuesConsumer.java | 4 +- .../lucene54/Lucene54DocValuesFormat.java | 4 +- .../lucene54/Lucene54DocValuesProducer.java | 4 +- .../lucene/codecs/lucene54/package-info.java | 1 - .../lucene/codecs/lucene60/Lucene60Codec.java | 4 +- .../lucene60/Lucene60FieldInfosFormat.java | 4 +- .../codecs/lucene60/Lucene60PointFormat.java | 4 +- .../codecs/lucene60/Lucene60PointReader.java | 4 +- .../codecs/lucene60/Lucene60PointWriter.java | 4 +- .../lucene/codecs/lucene60/package-info.java | 1 - .../apache/lucene/codecs/package-info.java | 1 - .../perfield/PerFieldDocValuesFormat.java | 4 +- .../perfield/PerFieldPostingsFormat.java | 4 +- .../lucene/codecs/perfield/package-info.java | 1 - .../lucene/document/BinaryDocValuesField.java | 4 +- .../apache/lucene/document/BinaryPoint.java | 4 +- .../lucene/document/CompressionTools.java | 4 +- .../org/apache/lucene/document/DateTools.java | 4 +- .../org/apache/lucene/document/Document.java | 4 +- .../document/DocumentStoredFieldVisitor.java | 4 +- .../lucene/document/DoubleDocValuesField.java | 4 +- .../apache/lucene/document/DoublePoint.java | 4 +- .../org/apache/lucene/document/Field.java | 4 +- .../org/apache/lucene/document/FieldType.java | 4 +- .../lucene/document/FloatDocValuesField.java | 4 +- .../apache/lucene/document/FloatPoint.java | 4 +- .../org/apache/lucene/document/IntPoint.java | 4 +- .../lucene/document/LegacyDoubleField.java | 4 +- .../lucene/document/LegacyFloatField.java | 4 +- .../lucene/document/LegacyIntField.java | 4 +- .../lucene/document/LegacyLongField.java | 4 +- .../org/apache/lucene/document/LongPoint.java | 4 +- .../document/NumericDocValuesField.java | 4 +- .../lucene/document/SortedDocValuesField.java | 4 +- .../document/SortedNumericDocValuesField.java | 4 +- .../document/SortedSetDocValuesField.java | 4 +- .../apache/lucene/document/StoredField.java | 4 +- .../apache/lucene/document/StringField.java | 4 +- .../org/apache/lucene/document/TextField.java | 4 +- .../apache/lucene/document/package-info.java | 1 - .../lucene/index/AbortingException.java | 4 +- .../lucene/index/AutomatonTermsEnum.java | 4 +- .../lucene/index/BaseCompositeReader.java | 4 +- .../apache/lucene/index/BinaryDocValues.java | 4 +- .../index/BinaryDocValuesFieldUpdates.java | 4 +- .../lucene/index/BinaryDocValuesWriter.java | 4 +- .../org/apache/lucene/index/BitsSlice.java | 8 +- .../apache/lucene/index/BufferedUpdates.java | 4 +- .../lucene/index/BufferedUpdatesStream.java | 4 +- .../apache/lucene/index/ByteSliceReader.java | 4 +- .../apache/lucene/index/ByteSliceWriter.java | 10 +-- .../org/apache/lucene/index/CheckIndex.java | 4 +- .../apache/lucene/index/CoalescedUpdates.java | 4 +- .../org/apache/lucene/index/CodecReader.java | 4 +- .../apache/lucene/index/CompositeReader.java | 4 +- .../lucene/index/CompositeReaderContext.java | 4 +- .../index/ConcurrentMergeScheduler.java | 4 +- .../lucene/index/CorruptIndexException.java | 4 +- .../lucene/index/DefaultIndexingChain.java | 4 +- .../apache/lucene/index/DirectoryReader.java | 4 +- .../org/apache/lucene/index/DocConsumer.java | 4 +- .../org/apache/lucene/index/DocValues.java | 4 +- .../lucene/index/DocValuesFieldUpdates.java | 4 +- .../apache/lucene/index/DocValuesType.java | 4 +- .../apache/lucene/index/DocValuesUpdate.java | 4 +- .../apache/lucene/index/DocValuesWriter.java | 4 +- .../apache/lucene/index/DocumentsWriter.java | 4 +- .../index/DocumentsWriterDeleteQueue.java | 27 +++--- .../index/DocumentsWriterFlushControl.java | 10 +-- .../index/DocumentsWriterFlushQueue.java | 28 +++--- .../index/DocumentsWriterPerThread.java | 10 +-- .../index/DocumentsWriterPerThreadPool.java | 8 +- .../index/DocumentsWriterStallControl.java | 10 +-- .../lucene/index/ExitableDirectoryReader.java | 4 +- .../org/apache/lucene/index/FieldInfo.java | 4 +- .../org/apache/lucene/index/FieldInfos.java | 4 +- .../lucene/index/FieldTermIterator.java | 4 +- .../java/org/apache/lucene/index/Fields.java | 4 +- .../lucene/index/FilterCodecReader.java | 4 +- .../lucene/index/FilterDirectoryReader.java | 4 +- .../apache/lucene/index/FilterLeafReader.java | 4 +- .../lucene/index/FilteredTermsEnum.java | 4 +- .../index/FlushByRamOrCountsPolicy.java | 10 +-- .../org/apache/lucene/index/FlushPolicy.java | 10 +-- .../apache/lucene/index/FreqProxFields.java | 4 +- .../lucene/index/FreqProxTermsWriter.java | 4 +- .../index/FreqProxTermsWriterPerField.java | 4 +- .../lucene/index/FrozenBufferedUpdates.java | 4 +- .../org/apache/lucene/index/IndexCommit.java | 5 +- .../lucene/index/IndexDeletionPolicy.java | 4 +- .../apache/lucene/index/IndexFileDeleter.java | 4 +- .../apache/lucene/index/IndexFileNames.java | 4 +- .../index/IndexFormatTooNewException.java | 1 - .../index/IndexFormatTooOldException.java | 1 - .../lucene/index/IndexNotFoundException.java | 4 +- .../org/apache/lucene/index/IndexOptions.java | 4 +- .../org/apache/lucene/index/IndexReader.java | 4 +- .../lucene/index/IndexReaderContext.java | 4 +- .../apache/lucene/index/IndexUpgrader.java | 4 +- .../org/apache/lucene/index/IndexWriter.java | 4 +- .../lucene/index/IndexWriterConfig.java | 4 +- .../apache/lucene/index/IndexableField.java | 4 +- .../lucene/index/IndexableFieldType.java | 4 +- .../KeepOnlyLastCommitDeletionPolicy.java | 4 +- .../org/apache/lucene/index/LeafReader.java | 4 +- .../lucene/index/LeafReaderContext.java | 4 +- .../lucene/index/LiveIndexWriterConfig.java | 4 +- .../lucene/index/LogByteSizeMergePolicy.java | 4 +- .../lucene/index/LogDocMergePolicy.java | 8 +- .../apache/lucene/index/LogMergePolicy.java | 4 +- .../lucene/index/MappedMultiFields.java | 4 +- .../index/MappingMultiPostingsEnum.java | 4 +- .../org/apache/lucene/index/MergePolicy.java | 4 +- .../apache/lucene/index/MergeRateLimiter.java | 4 +- .../apache/lucene/index/MergeScheduler.java | 4 +- .../org/apache/lucene/index/MergeState.java | 4 +- .../org/apache/lucene/index/MergeTrigger.java | 4 +- .../index/MergedPrefixCodedTermsIterator.java | 4 +- .../org/apache/lucene/index/MultiBits.java | 8 +- .../apache/lucene/index/MultiDocValues.java | 4 +- .../org/apache/lucene/index/MultiFields.java | 4 +- .../apache/lucene/index/MultiPointValues.java | 4 +- .../lucene/index/MultiPostingsEnum.java | 4 +- .../org/apache/lucene/index/MultiReader.java | 4 +- .../org/apache/lucene/index/MultiTerms.java | 4 +- .../apache/lucene/index/MultiTermsEnum.java | 4 +- .../apache/lucene/index/NoDeletionPolicy.java | 4 +- .../apache/lucene/index/NoMergePolicy.java | 4 +- .../apache/lucene/index/NoMergeScheduler.java | 4 +- .../apache/lucene/index/NormValuesWriter.java | 4 +- .../apache/lucene/index/NumericDocValues.java | 4 +- .../index/NumericDocValuesFieldUpdates.java | 18 ++-- .../lucene/index/NumericDocValuesWriter.java | 4 +- .../org/apache/lucene/index/OrdTermState.java | 4 +- .../lucene/index/ParallelCompositeReader.java | 4 +- .../lucene/index/ParallelLeafReader.java | 4 +- .../lucene/index/ParallelPostingsArray.java | 4 +- .../PersistentSnapshotDeletionPolicy.java | 27 +++--- .../org/apache/lucene/index/PointValues.java | 4 +- .../lucene/index/PointValuesWriter.java | 4 +- .../org/apache/lucene/index/PostingsEnum.java | 4 +- .../apache/lucene/index/PrefixCodedTerms.java | 4 +- .../org/apache/lucene/index/QueryTimeout.java | 4 +- .../apache/lucene/index/QueryTimeoutImpl.java | 4 +- .../apache/lucene/index/RandomAccessOrds.java | 4 +- .../apache/lucene/index/ReaderManager.java | 4 +- .../org/apache/lucene/index/ReaderSlice.java | 4 +- .../org/apache/lucene/index/ReaderUtil.java | 4 +- .../lucene/index/ReadersAndUpdates.java | 4 +- .../lucene/index/SegmentCommitInfo.java | 4 +- .../lucene/index/SegmentCoreReaders.java | 4 +- .../apache/lucene/index/SegmentDocValues.java | 4 +- .../index/SegmentDocValuesProducer.java | 4 +- .../org/apache/lucene/index/SegmentInfo.java | 4 +- .../org/apache/lucene/index/SegmentInfos.java | 4 +- .../apache/lucene/index/SegmentMerger.java | 4 +- .../apache/lucene/index/SegmentReadState.java | 4 +- .../apache/lucene/index/SegmentReader.java | 4 +- .../lucene/index/SegmentWriteState.java | 4 +- .../lucene/index/SerialMergeScheduler.java | 4 +- .../index/SimpleMergedSegmentWarmer.java | 4 +- .../apache/lucene/index/SingleTermsEnum.java | 4 +- .../SingletonSortedNumericDocValues.java | 4 +- .../index/SingletonSortedSetDocValues.java | 4 +- .../lucene/index/SlowCodecReaderWrapper.java | 4 +- .../index/SlowCompositeReaderWrapper.java | 4 +- .../lucene/index/SnapshotDeletionPolicy.java | 4 +- .../apache/lucene/index/SortedDocValues.java | 4 +- .../index/SortedDocValuesTermsEnum.java | 4 +- .../lucene/index/SortedDocValuesWriter.java | 4 +- .../lucene/index/SortedNumericDocValues.java | 4 +- .../index/SortedNumericDocValuesWriter.java | 4 +- .../lucene/index/SortedSetDocValues.java | 4 +- .../index/SortedSetDocValuesTermsEnum.java | 4 +- .../index/SortedSetDocValuesWriter.java | 4 +- .../lucene/index/StandardDirectoryReader.java | 4 +- .../lucene/index/StoredFieldVisitor.java | 4 +- .../java/org/apache/lucene/index/Term.java | 4 +- .../org/apache/lucene/index/TermContext.java | 4 +- .../org/apache/lucene/index/TermState.java | 4 +- .../lucene/index/TermVectorsConsumer.java | 4 +- .../index/TermVectorsConsumerPerField.java | 4 +- .../java/org/apache/lucene/index/Terms.java | 4 +- .../org/apache/lucene/index/TermsEnum.java | 4 +- .../org/apache/lucene/index/TermsHash.java | 4 +- .../lucene/index/TermsHashPerField.java | 4 +- .../lucene/index/TieredMergePolicy.java | 4 +- .../lucene/index/TrackingIndexWriter.java | 4 +- .../apache/lucene/index/TwoPhaseCommit.java | 8 +- .../lucene/index/TwoPhaseCommitTool.java | 8 +- .../lucene/index/UpgradeIndexMergePolicy.java | 4 +- .../org/apache/lucene/index/package-info.java | 1 - .../java/org/apache/lucene/package-info.java | 3 +- .../apache/lucene/search/AutomatonQuery.java | 4 +- .../lucene/search/BlendedTermQuery.java | 4 +- .../apache/lucene/search/BooleanClause.java | 4 +- .../apache/lucene/search/BooleanQuery.java | 4 +- .../apache/lucene/search/BooleanScorer.java | 4 +- .../lucene/search/BooleanTopLevelScorers.java | 4 +- .../apache/lucene/search/BooleanWeight.java | 4 +- .../apache/lucene/search/BoostAttribute.java | 4 +- .../lucene/search/BoostAttributeImpl.java | 4 +- .../org/apache/lucene/search/BoostQuery.java | 4 +- .../org/apache/lucene/search/BulkScorer.java | 4 +- .../lucene/search/CachingCollector.java | 4 +- .../lucene/search/CollectionStatistics.java | 10 +-- .../search/CollectionTerminatedException.java | 4 +- .../org/apache/lucene/search/Collector.java | 4 +- .../lucene/search/CollectorManager.java | 4 +- .../apache/lucene/search/ConjunctionDISI.java | 4 +- .../lucene/search/ConjunctionScorer.java | 4 +- .../lucene/search/ConstantScoreQuery.java | 4 +- .../lucene/search/ConstantScoreScorer.java | 4 +- .../lucene/search/ConstantScoreWeight.java | 4 +- .../ControlledRealTimeReopenThread.java | 4 +- .../lucene/search/DisiPriorityQueue.java | 4 +- .../org/apache/lucene/search/DisiWrapper.java | 4 +- .../search/DisjunctionDISIApproximation.java | 2 +- .../lucene/search/DisjunctionMaxQuery.java | 14 +-- .../lucene/search/DisjunctionMaxScorer.java | 14 +-- .../lucene/search/DisjunctionScorer.java | 4 +- .../lucene/search/DisjunctionSumScorer.java | 4 +- .../org/apache/lucene/search/DocIdSet.java | 4 +- .../lucene/search/DocIdSetIterator.java | 4 +- .../lucene/search/DocValuesDocIdSet.java | 2 +- .../lucene/search/DocValuesRewriteMethod.java | 4 +- .../lucene/search/ExactPhraseScorer.java | 4 +- .../apache/lucene/search/ExactPointQuery.java | 4 +- .../org/apache/lucene/search/Explanation.java | 4 +- .../org/apache/lucene/search/FakeScorer.java | 4 +- .../apache/lucene/search/FieldComparator.java | 4 +- .../lucene/search/FieldComparatorSource.java | 4 +- .../org/apache/lucene/search/FieldDoc.java | 4 +- .../lucene/search/FieldValueHitQueue.java | 4 +- .../apache/lucene/search/FieldValueQuery.java | 4 +- .../apache/lucene/search/FilterCollector.java | 12 +-- .../lucene/search/FilterLeafCollector.java | 4 +- .../apache/lucene/search/FilterScorer.java | 4 +- .../search/FilteredDocIdSetIterator.java | 4 +- .../org/apache/lucene/search/FuzzyQuery.java | 4 +- .../apache/lucene/search/FuzzyTermsEnum.java | 4 +- .../org/apache/lucene/search/HitQueue.java | 4 +- .../apache/lucene/search/IndexSearcher.java | 4 +- .../apache/lucene/search/LRUQueryCache.java | 4 +- .../apache/lucene/search/LeafCollector.java | 4 +- .../lucene/search/LeafFieldComparator.java | 4 +- .../search/LegacyNumericRangeQuery.java | 4 +- .../apache/lucene/search/LiveFieldValues.java | 4 +- .../lucene/search/MatchAllDocsQuery.java | 4 +- .../lucene/search/MatchNoDocsQuery.java | 4 +- .../MaxNonCompetitiveBoostAttribute.java | 4 +- .../MaxNonCompetitiveBoostAttributeImpl.java | 4 +- .../search/MinShouldMatchSumScorer.java | 4 +- .../apache/lucene/search/MultiCollector.java | 4 +- .../lucene/search/MultiPhraseQuery.java | 4 +- .../apache/lucene/search/MultiTermQuery.java | 4 +- .../MultiTermQueryConstantScoreWrapper.java | 4 +- .../org/apache/lucene/search/Multiset.java | 4 +- .../lucene/search/NGramPhraseQuery.java | 4 +- .../apache/lucene/search/PhrasePositions.java | 4 +- .../org/apache/lucene/search/PhraseQuery.java | 4 +- .../org/apache/lucene/search/PhraseQueue.java | 4 +- .../apache/lucene/search/PointRangeQuery.java | 4 +- .../search/PositiveScoresOnlyCollector.java | 4 +- .../org/apache/lucene/search/PrefixQuery.java | 4 +- .../java/org/apache/lucene/search/Query.java | 4 +- .../org/apache/lucene/search/QueryCache.java | 4 +- .../lucene/search/QueryCachingPolicy.java | 4 +- .../apache/lucene/search/QueryRescorer.java | 4 +- .../lucene/search/RandomAccessWeight.java | 4 +- .../lucene/search/ReferenceManager.java | 4 +- .../org/apache/lucene/search/RegexpQuery.java | 4 +- .../lucene/search/ReqExclBulkScorer.java | 4 +- .../apache/lucene/search/ReqExclScorer.java | 4 +- .../apache/lucene/search/ReqOptSumScorer.java | 2 +- .../org/apache/lucene/search/Rescorer.java | 4 +- .../search/ScoreCachingWrappingScorer.java | 4 +- .../org/apache/lucene/search/ScoreDoc.java | 4 +- .../java/org/apache/lucene/search/Scorer.java | 4 +- .../apache/lucene/search/ScoringRewrite.java | 4 +- .../apache/lucene/search/SearcherFactory.java | 4 +- .../search/SearcherLifetimeManager.java | 4 +- .../apache/lucene/search/SearcherManager.java | 4 +- .../apache/lucene/search/SimpleCollector.java | 4 +- .../lucene/search/SimpleFieldComparator.java | 4 +- .../lucene/search/SloppyPhraseScorer.java | 4 +- .../java/org/apache/lucene/search/Sort.java | 4 +- .../org/apache/lucene/search/SortField.java | 4 +- .../apache/lucene/search/SortRescorer.java | 4 +- .../lucene/search/SortedNumericSelector.java | 4 +- .../lucene/search/SortedNumericSortField.java | 4 +- .../lucene/search/SortedSetSelector.java | 4 +- .../lucene/search/SortedSetSortField.java | 4 +- .../apache/lucene/search/SynonymQuery.java | 4 +- .../lucene/search/TermCollectingRewrite.java | 4 +- .../org/apache/lucene/search/TermQuery.java | 4 +- .../apache/lucene/search/TermRangeQuery.java | 4 +- .../org/apache/lucene/search/TermScorer.java | 4 +- .../apache/lucene/search/TermStatistics.java | 4 +- .../lucene/search/TimeLimitingCollector.java | 4 +- .../org/apache/lucene/search/TopDocs.java | 4 +- .../lucene/search/TopDocsCollector.java | 4 +- .../lucene/search/TopFieldCollector.java | 4 +- .../apache/lucene/search/TopFieldDocs.java | 4 +- .../lucene/search/TopScoreDocCollector.java | 4 +- .../apache/lucene/search/TopTermsRewrite.java | 4 +- .../lucene/search/TotalHitCountCollector.java | 4 +- .../lucene/search/TwoPhaseIterator.java | 4 +- .../UsageTrackingQueryCachingPolicy.java | 4 +- .../java/org/apache/lucene/search/Weight.java | 4 +- .../apache/lucene/search/WildcardQuery.java | 4 +- .../apache/lucene/search/package-info.java | 1 - .../search/similarities/AfterEffect.java | 4 +- .../search/similarities/AfterEffectB.java | 4 +- .../search/similarities/AfterEffectL.java | 4 +- .../search/similarities/BM25Similarity.java | 4 +- .../search/similarities/BasicModel.java | 4 +- .../search/similarities/BasicModelBE.java | 4 +- .../search/similarities/BasicModelD.java | 4 +- .../search/similarities/BasicModelG.java | 4 +- .../search/similarities/BasicModelIF.java | 4 +- .../search/similarities/BasicModelIn.java | 4 +- .../search/similarities/BasicModelIne.java | 4 +- .../search/similarities/BasicModelP.java | 4 +- .../search/similarities/BasicStats.java | 4 +- .../similarities/ClassicSimilarity.java | 4 +- .../search/similarities/DFISimilarity.java | 4 +- .../search/similarities/DFRSimilarity.java | 4 +- .../search/similarities/Distribution.java | 4 +- .../search/similarities/DistributionLL.java | 4 +- .../search/similarities/DistributionSPL.java | 4 +- .../search/similarities/IBSimilarity.java | 4 +- .../search/similarities/Independence.java | 4 +- .../similarities/IndependenceChiSquared.java | 4 +- .../similarities/IndependenceSaturated.java | 4 +- .../IndependenceStandardized.java | 4 +- .../similarities/LMDirichletSimilarity.java | 4 +- .../LMJelinekMercerSimilarity.java | 4 +- .../search/similarities/LMSimilarity.java | 4 +- .../lucene/search/similarities/Lambda.java | 4 +- .../lucene/search/similarities/LambdaDF.java | 4 +- .../lucene/search/similarities/LambdaTTF.java | 4 +- .../search/similarities/MultiSimilarity.java | 4 +- .../search/similarities/Normalization.java | 4 +- .../search/similarities/NormalizationH1.java | 4 +- .../search/similarities/NormalizationH2.java | 4 +- .../search/similarities/NormalizationH3.java | 4 +- .../search/similarities/NormalizationZ.java | 4 +- .../PerFieldSimilarityWrapper.java | 4 +- .../search/similarities/Similarity.java | 4 +- .../search/similarities/SimilarityBase.java | 4 +- .../search/similarities/TFIDFSimilarity.java | 4 +- .../search/similarities/package-info.java | 1 - .../lucene/search/spans/ConjunctionSpans.java | 4 +- .../lucene/search/spans/ContainSpans.java | 4 +- .../search/spans/FieldMaskingSpanQuery.java | 4 +- .../lucene/search/spans/FilterSpans.java | 4 +- .../lucene/search/spans/NearSpansOrdered.java | 4 +- .../search/spans/NearSpansUnordered.java | 4 +- .../search/spans/ScoringWrapperSpans.java | 4 +- .../lucene/search/spans/SpanBoostQuery.java | 4 +- .../lucene/search/spans/SpanCollector.java | 4 +- .../lucene/search/spans/SpanContainQuery.java | 4 +- .../search/spans/SpanContainingQuery.java | 4 +- .../lucene/search/spans/SpanFirstQuery.java | 4 +- .../spans/SpanMultiTermQueryWrapper.java | 4 +- .../lucene/search/spans/SpanNearQuery.java | 4 +- .../lucene/search/spans/SpanNotQuery.java | 4 +- .../lucene/search/spans/SpanOrQuery.java | 4 +- .../search/spans/SpanPositionCheckQuery.java | 2 +- .../search/spans/SpanPositionQueue.java | 4 +- .../search/spans/SpanPositionRangeQuery.java | 2 +- .../apache/lucene/search/spans/SpanQuery.java | 4 +- .../lucene/search/spans/SpanScorer.java | 4 +- .../lucene/search/spans/SpanTermQuery.java | 4 +- .../lucene/search/spans/SpanWeight.java | 4 +- .../lucene/search/spans/SpanWithinQuery.java | 4 +- .../org/apache/lucene/search/spans/Spans.java | 4 +- .../apache/lucene/search/spans/TermSpans.java | 14 +-- .../lucene/search/spans/package-info.java | 1 - .../lucene/store/AlreadyClosedException.java | 4 +- .../apache/lucene/store/BaseDirectory.java | 4 +- .../apache/lucene/store/BufferedChecksum.java | 4 +- .../store/BufferedChecksumIndexInput.java | 4 +- .../lucene/store/BufferedIndexInput.java | 4 +- .../lucene/store/ByteArrayDataInput.java | 4 +- .../lucene/store/ByteArrayDataOutput.java | 4 +- .../lucene/store/ByteBufferIndexInput.java | 4 +- .../lucene/store/ChecksumIndexInput.java | 8 +- .../org/apache/lucene/store/DataInput.java | 4 +- .../org/apache/lucene/store/DataOutput.java | 4 +- .../org/apache/lucene/store/Directory.java | 4 +- .../org/apache/lucene/store/FSDirectory.java | 4 +- .../apache/lucene/store/FSLockFactory.java | 4 +- .../lucene/store/FileSwitchDirectory.java | 4 +- .../apache/lucene/store/FilterDirectory.java | 4 +- .../org/apache/lucene/store/FlushInfo.java | 4 +- .../org/apache/lucene/store/IOContext.java | 4 +- .../org/apache/lucene/store/IndexInput.java | 4 +- .../org/apache/lucene/store/IndexOutput.java | 4 +- .../lucene/store/InputStreamDataInput.java | 4 +- .../java/org/apache/lucene/store/Lock.java | 4 +- .../org/apache/lucene/store/LockFactory.java | 4 +- .../store/LockObtainFailedException.java | 1 - .../store/LockReleaseFailedException.java | 1 - .../apache/lucene/store/LockStressTest.java | 4 +- .../store/LockValidatingDirectoryWrapper.java | 4 +- .../apache/lucene/store/LockVerifyServer.java | 4 +- .../apache/lucene/store/MMapDirectory.java | 4 +- .../org/apache/lucene/store/MergeInfo.java | 2 +- .../apache/lucene/store/NIOFSDirectory.java | 27 +++--- .../lucene/store/NRTCachingDirectory.java | 4 +- .../lucene/store/NativeFSLockFactory.java | 4 +- .../apache/lucene/store/NoLockFactory.java | 4 +- .../lucene/store/OutputStreamDataOutput.java | 4 +- .../lucene/store/OutputStreamIndexOutput.java | 4 +- .../org/apache/lucene/store/RAMDirectory.java | 4 +- .../java/org/apache/lucene/store/RAMFile.java | 4 +- .../apache/lucene/store/RAMInputStream.java | 4 +- .../apache/lucene/store/RAMOutputStream.java | 4 +- .../lucene/store/RandomAccessInput.java | 4 +- .../lucene/store/RateLimitedIndexOutput.java | 4 +- .../org/apache/lucene/store/RateLimiter.java | 4 +- .../lucene/store/SimpleFSDirectory.java | 4 +- .../lucene/store/SimpleFSLockFactory.java | 4 +- .../store/SingleInstanceLockFactory.java | 4 +- .../lucene/store/SleepingLockWrapper.java | 4 +- .../store/TrackingDirectoryWrapper.java | 4 +- .../lucene/store/VerifyingLockFactory.java | 4 +- .../org/apache/lucene/store/package-info.java | 1 - .../org/apache/lucene/util/Accountable.java | 4 +- .../org/apache/lucene/util/Accountables.java | 4 +- .../lucene/util/ArrayInPlaceMergeSorter.java | 4 +- .../apache/lucene/util/ArrayIntroSorter.java | 4 +- .../apache/lucene/util/ArrayTimSorter.java | 4 +- .../org/apache/lucene/util/ArrayUtil.java | 4 +- .../org/apache/lucene/util/Attribute.java | 4 +- .../apache/lucene/util/AttributeFactory.java | 4 +- .../org/apache/lucene/util/AttributeImpl.java | 4 +- .../lucene/util/AttributeReflector.java | 4 +- .../apache/lucene/util/AttributeSource.java | 4 +- .../org/apache/lucene/util/BitDocIdSet.java | 4 +- .../java/org/apache/lucene/util/BitSet.java | 4 +- .../apache/lucene/util/BitSetIterator.java | 4 +- .../java/org/apache/lucene/util/BitUtil.java | 1 - .../src/java/org/apache/lucene/util/Bits.java | 4 +- .../org/apache/lucene/util/ByteBlockPool.java | 4 +- .../java/org/apache/lucene/util/BytesRef.java | 4 +- .../org/apache/lucene/util/BytesRefArray.java | 27 +++--- .../apache/lucene/util/BytesRefBuilder.java | 4 +- .../org/apache/lucene/util/BytesRefHash.java | 4 +- .../apache/lucene/util/BytesRefIterator.java | 4 +- .../java/org/apache/lucene/util/CharsRef.java | 4 +- .../apache/lucene/util/CharsRefBuilder.java | 4 +- .../lucene/util/CloseableThreadLocal.java | 4 +- .../apache/lucene/util/CollectionUtil.java | 4 +- .../apache/lucene/util/CommandLineUtil.java | 4 +- .../org/apache/lucene/util/Constants.java | 4 +- .../java/org/apache/lucene/util/Counter.java | 8 +- .../apache/lucene/util/DocIdSetBuilder.java | 4 +- .../apache/lucene/util/FilterIterator.java | 27 +++--- .../org/apache/lucene/util/FixedBitSet.java | 4 +- .../util/FrequencyTrackingRingBuffer.java | 4 +- .../java/org/apache/lucene/util/IOUtils.java | 4 +- .../lucene/util/InPlaceMergeSorter.java | 4 +- .../org/apache/lucene/util/InfoStream.java | 4 +- .../apache/lucene/util/IntArrayDocIdSet.java | 4 +- .../org/apache/lucene/util/IntBlockPool.java | 4 +- .../org/apache/lucene/util/IntroSorter.java | 4 +- .../java/org/apache/lucene/util/IntsRef.java | 8 +- .../apache/lucene/util/IntsRefBuilder.java | 4 +- .../apache/lucene/util/LSBRadixSorter.java | 4 +- .../lucene/util/LegacyNumericUtils.java | 4 +- .../org/apache/lucene/util/LongBitSet.java | 4 +- .../org/apache/lucene/util/LongValues.java | 4 +- .../java/org/apache/lucene/util/LongsRef.java | 8 +- .../org/apache/lucene/util/MapOfSets.java | 4 +- .../java/org/apache/lucene/util/MathUtil.java | 4 +- .../apache/lucene/util/MergedIterator.java | 4 +- .../org/apache/lucene/util/MutableBits.java | 4 +- .../apache/lucene/util/NamedSPILoader.java | 4 +- .../lucene/util/NamedThreadFactory.java | 4 +- .../org/apache/lucene/util/NotDocIdSet.java | 4 +- .../org/apache/lucene/util/NumericUtils.java | 4 +- .../org/apache/lucene/util/OfflineSorter.java | 4 +- .../org/apache/lucene/util/PagedBytes.java | 4 +- .../lucene/util/PrintStreamInfoStream.java | 4 +- .../org/apache/lucene/util/PriorityQueue.java | 10 +-- .../org/apache/lucene/util/QueryBuilder.java | 4 +- .../apache/lucene/util/RamUsageEstimator.java | 4 +- .../util/RecyclingByteBlockAllocator.java | 8 +- .../util/RecyclingIntBlockAllocator.java | 8 +- .../java/org/apache/lucene/util/RefCount.java | 10 +-- .../apache/lucene/util/RoaringDocIdSet.java | 4 +- .../org/apache/lucene/util/RollingBuffer.java | 4 +- .../apache/lucene/util/SPIClassIterator.java | 4 +- .../apache/lucene/util/SentinelIntSet.java | 4 +- .../java/org/apache/lucene/util/SetOnce.java | 8 +- .../org/apache/lucene/util/SloppyMath.java | 4 +- .../org/apache/lucene/util/SmallFloat.java | 14 +-- .../java/org/apache/lucene/util/Sorter.java | 4 +- .../apache/lucene/util/SparseFixedBitSet.java | 4 +- .../lucene/util/StrictStringTokenizer.java | 4 +- .../org/apache/lucene/util/StringHelper.java | 4 +- .../apache/lucene/util/SuppressForbidden.java | 4 +- .../util/ThreadInterruptedException.java | 9 +- .../org/apache/lucene/util/TimSorter.java | 4 +- .../org/apache/lucene/util/ToStringUtils.java | 4 +- .../org/apache/lucene/util/UnicodeUtil.java | 6 +- .../java/org/apache/lucene/util/Version.java | 4 +- .../org/apache/lucene/util/VirtualMethod.java | 4 +- .../apache/lucene/util/WeakIdentityMap.java | 4 +- .../lucene/util/automaton/Automaton.java | 4 +- .../util/automaton/ByteRunAutomaton.java | 4 +- .../util/automaton/CharacterRunAutomaton.java | 4 +- .../util/automaton/CompiledAutomaton.java | 4 +- .../DaciukMihovAutomatonBuilder.java | 4 +- .../util/automaton/FiniteStringsIterator.java | 4 +- .../automaton/Lev1ParametricDescription.java | 3 +- .../automaton/Lev1TParametricDescription.java | 3 +- .../automaton/Lev2ParametricDescription.java | 3 +- .../automaton/Lev2TParametricDescription.java | 3 +- .../util/automaton/LevenshteinAutomata.java | 4 +- .../LimitedFiniteStringsIterator.java | 4 +- .../lucene/util/automaton/SortedIntSet.java | 4 +- .../TooComplexToDeterminizeException.java | 4 +- .../lucene/util/automaton/Transition.java | 4 +- .../lucene/util/automaton/UTF32ToUTF8.java | 4 +- .../util/automaton/createLevAutomata.py | 89 +++++++++---------- .../org/apache/lucene/util/bkd/BKDReader.java | 4 +- .../org/apache/lucene/util/bkd/BKDWriter.java | 4 +- .../lucene/util/bkd/HeapPointReader.java | 4 +- .../lucene/util/bkd/HeapPointWriter.java | 4 +- .../lucene/util/bkd/OfflinePointReader.java | 4 +- .../lucene/util/bkd/OfflinePointWriter.java | 4 +- .../apache/lucene/util/bkd/PointReader.java | 4 +- .../apache/lucene/util/bkd/PointWriter.java | 4 +- .../apache/lucene/util/bkd/package-info.java | 1 - .../org/apache/lucene/util/fst/Builder.java | 4 +- .../lucene/util/fst/ByteSequenceOutputs.java | 4 +- .../lucene/util/fst/BytesRefFSTEnum.java | 4 +- .../apache/lucene/util/fst/BytesStore.java | 4 +- .../lucene/util/fst/CharSequenceOutputs.java | 4 +- .../java/org/apache/lucene/util/fst/FST.java | 4 +- .../org/apache/lucene/util/fst/FSTEnum.java | 4 +- .../lucene/util/fst/ForwardBytesReader.java | 4 +- .../lucene/util/fst/IntSequenceOutputs.java | 4 +- .../lucene/util/fst/IntsRefFSTEnum.java | 4 +- .../org/apache/lucene/util/fst/NoOutputs.java | 4 +- .../org/apache/lucene/util/fst/NodeHash.java | 4 +- .../org/apache/lucene/util/fst/Outputs.java | 4 +- .../apache/lucene/util/fst/PairOutputs.java | 4 +- .../lucene/util/fst/PositiveIntOutputs.java | 4 +- .../lucene/util/fst/ReverseBytesReader.java | 4 +- .../java/org/apache/lucene/util/fst/Util.java | 4 +- .../apache/lucene/util/fst/package-info.java | 1 - .../lucene/util/mutable/package-info.java | 1 - .../org/apache/lucene/util/package-info.java | 1 - .../packed/AbstractBlockPackedWriter.java | 4 +- .../util/packed/AbstractPagedMutable.java | 4 +- .../lucene/util/packed/BlockPackedReader.java | 4 +- .../packed/BlockPackedReaderIterator.java | 4 +- .../lucene/util/packed/BlockPackedWriter.java | 4 +- .../lucene/util/packed/BulkOperation.java | 3 +- .../util/packed/BulkOperationPacked.java | 6 +- .../util/packed/BulkOperationPacked1.java | 3 +- .../util/packed/BulkOperationPacked10.java | 3 +- .../util/packed/BulkOperationPacked11.java | 3 +- .../util/packed/BulkOperationPacked12.java | 3 +- .../util/packed/BulkOperationPacked13.java | 3 +- .../util/packed/BulkOperationPacked14.java | 3 +- .../util/packed/BulkOperationPacked15.java | 3 +- .../util/packed/BulkOperationPacked16.java | 3 +- .../util/packed/BulkOperationPacked17.java | 3 +- .../util/packed/BulkOperationPacked18.java | 3 +- .../util/packed/BulkOperationPacked19.java | 3 +- .../util/packed/BulkOperationPacked2.java | 3 +- .../util/packed/BulkOperationPacked20.java | 3 +- .../util/packed/BulkOperationPacked21.java | 3 +- .../util/packed/BulkOperationPacked22.java | 3 +- .../util/packed/BulkOperationPacked23.java | 3 +- .../util/packed/BulkOperationPacked24.java | 3 +- .../util/packed/BulkOperationPacked3.java | 3 +- .../util/packed/BulkOperationPacked4.java | 3 +- .../util/packed/BulkOperationPacked5.java | 3 +- .../util/packed/BulkOperationPacked6.java | 3 +- .../util/packed/BulkOperationPacked7.java | 3 +- .../util/packed/BulkOperationPacked8.java | 3 +- .../util/packed/BulkOperationPacked9.java | 3 +- .../BulkOperationPackedSingleBlock.java | 4 +- .../util/packed/DeltaPackedLongValues.java | 4 +- .../apache/lucene/util/packed/Direct16.java | 8 +- .../apache/lucene/util/packed/Direct32.java | 8 +- .../apache/lucene/util/packed/Direct64.java | 3 +- .../apache/lucene/util/packed/Direct8.java | 8 +- .../util/packed/DirectMonotonicReader.java | 4 +- .../util/packed/DirectMonotonicWriter.java | 4 +- .../DirectPacked64SingleBlockReader.java | 4 +- .../util/packed/DirectPackedReader.java | 4 +- .../lucene/util/packed/DirectReader.java | 4 +- .../lucene/util/packed/DirectWriter.java | 4 +- .../lucene/util/packed/GrowableWriter.java | 4 +- .../packed/MonotonicBlockPackedReader.java | 4 +- .../packed/MonotonicBlockPackedWriter.java | 4 +- .../util/packed/MonotonicLongValues.java | 4 +- .../util/packed/Packed16ThreeBlocks.java | 3 +- .../apache/lucene/util/packed/Packed64.java | 4 +- .../util/packed/Packed64SingleBlock.java | 3 +- .../util/packed/Packed8ThreeBlocks.java | 3 +- .../lucene/util/packed/PackedDataInput.java | 4 +- .../lucene/util/packed/PackedDataOutput.java | 4 +- .../apache/lucene/util/packed/PackedInts.java | 4 +- .../lucene/util/packed/PackedLongValues.java | 4 +- .../util/packed/PackedReaderIterator.java | 4 +- .../lucene/util/packed/PackedWriter.java | 4 +- .../util/packed/PagedGrowableWriter.java | 4 +- .../lucene/util/packed/PagedMutable.java | 4 +- .../lucene/util/packed/gen_BulkOperation.py | 79 ++++++++-------- .../apache/lucene/util/packed/gen_Direct.py | 29 +++--- .../util/packed/gen_Packed64SingleBlock.py | 45 +++++----- .../util/packed/gen_PackedThreeBlocks.py | 27 +++--- .../lucene/util/packed/package-info.java | 1 - .../org/apache/lucene/TestAssertions.java | 4 +- .../src/test/org/apache/lucene/TestDemo.java | 4 +- .../org/apache/lucene/TestExternalCodecs.java | 4 +- .../lucene/TestMergeSchedulerExternal.java | 4 +- .../test/org/apache/lucene/TestSearch.java | 4 +- .../lucene/TestSearchForDuplicates.java | 4 +- .../analysis/TestCachingTokenFilter.java | 4 +- .../lucene/analysis/TestCharFilter.java | 4 +- .../analysis/TestNumericTokenStream.java | 4 +- .../analysis/TestReusableStringReader.java | 12 +-- .../org/apache/lucene/analysis/TestToken.java | 4 +- .../tokenattributes/TestBytesRefAttImpl.java | 4 +- .../TestCharTermAttributeImpl.java | 4 +- .../TestPackedTokenAttributeImpl.java | 4 +- .../TestSimpleAttributeImpl.java | 4 +- .../codecs/TestCodecLoadingDeadlock.java | 4 +- .../AbstractTestCompressionMode.java | 4 +- .../AbstractTestLZ4CompressionMode.java | 4 +- .../compressing/TestFastCompressionMode.java | 4 +- .../TestFastDecompressionMode.java | 4 +- .../TestGrowableByteArrayDataOutput.java | 4 +- .../compressing/TestHighCompressionMode.java | 4 +- .../lucene50/TestBlockPostingsFormat.java | 4 +- .../lucene50/TestBlockPostingsFormat2.java | 4 +- .../lucene50/TestBlockPostingsFormat3.java | 4 +- .../lucene/codecs/lucene50/TestForUtil.java | 4 +- .../lucene50/TestLucene50CompoundFormat.java | 4 +- .../lucene50/TestLucene50FieldInfoFormat.java | 4 +- .../TestLucene50SegmentInfoFormat.java | 4 +- .../TestLucene50StoredFieldsFormat.java | 4 +- ...ne50StoredFieldsFormatHighCompression.java | 4 +- .../TestLucene50TermVectorsFormat.java | 4 +- .../lucene53/TestLucene53NormsFormat.java | 4 +- .../lucene54/TestLucene54DocValuesFormat.java | 4 +- .../lucene60/TestLucene60PointFormat.java | 4 +- .../perfield/TestPerFieldDocValuesFormat.java | 4 +- .../perfield/TestPerFieldPostingsFormat.java | 4 +- .../perfield/TestPerFieldPostingsFormat2.java | 4 +- .../lucene/document/TestBinaryDocument.java | 4 +- .../apache/lucene/document/TestDateTools.java | 16 ++-- .../apache/lucene/document/TestDocument.java | 4 +- .../org/apache/lucene/document/TestField.java | 4 +- .../apache/lucene/document/TestFieldType.java | 4 +- .../lucene/index/Test2BBinaryDocValues.java | 4 +- .../lucene/index/Test2BNumericDocValues.java | 4 +- .../apache/lucene/index/Test2BPositions.java | 4 +- .../apache/lucene/index/Test2BPostings.java | 4 +- .../lucene/index/Test2BPostingsBytes.java | 4 +- .../Test2BSortedDocValuesFixedSorted.java | 4 +- .../index/Test2BSortedDocValuesOrds.java | 4 +- .../org/apache/lucene/index/Test2BTerms.java | 4 +- .../lucene/index/Test4GBStoredFields.java | 4 +- .../apache/lucene/index/TestAddIndexes.java | 4 +- .../index/TestAllFilesCheckIndexHeader.java | 4 +- .../index/TestAllFilesDetectTruncation.java | 4 +- .../index/TestAllFilesHaveChecksumFooter.java | 4 +- .../index/TestAllFilesHaveCodecHeader.java | 4 +- .../apache/lucene/index/TestAtomicUpdate.java | 15 ++-- .../lucene/index/TestBagOfPositions.java | 4 +- .../lucene/index/TestBagOfPostings.java | 4 +- .../index/TestBinaryDocValuesUpdates.java | 32 +++---- .../apache/lucene/index/TestBinaryTerms.java | 4 +- .../apache/lucene/index/TestByteSlices.java | 12 +-- .../apache/lucene/index/TestCheckIndex.java | 4 +- .../lucene/index/TestCodecHoldsOpenFiles.java | 4 +- .../apache/lucene/index/TestCodecUtil.java | 4 +- .../org/apache/lucene/index/TestCodecs.java | 4 +- .../index/TestConcurrentMergeScheduler.java | 4 +- .../index/TestConsistentFieldNumbers.java | 4 +- .../org/apache/lucene/index/TestCrash.java | 4 +- .../index/TestCrashCausesCorruptIndex.java | 4 +- .../apache/lucene/index/TestCustomNorms.java | 4 +- .../lucene/index/TestDeletionPolicy.java | 4 +- .../index/TestDemoParallelLeafReader.java | 4 +- .../lucene/index/TestDirectoryReader.java | 4 +- .../index/TestDirectoryReaderReopen.java | 4 +- .../test/org/apache/lucene/index/TestDoc.java | 4 +- .../org/apache/lucene/index/TestDocCount.java | 4 +- .../TestDocInverterPerFieldErrorInfo.java | 4 +- .../apache/lucene/index/TestDocValues.java | 4 +- .../lucene/index/TestDocValuesIndexing.java | 4 +- .../lucene/index/TestDocsAndPositions.java | 4 +- .../lucene/index/TestDocumentWriter.java | 4 +- .../index/TestDocumentsWriterDeleteQueue.java | 29 +++--- .../TestDocumentsWriterStallControl.java | 27 +++--- .../lucene/index/TestDuelingCodecs.java | 4 +- .../index/TestDuelingCodecsAtNight.java | 4 +- .../lucene/index/TestExceedMaxTermLength.java | 4 +- .../index/TestExitableDirectoryReader.java | 4 +- .../apache/lucene/index/TestFieldReuse.java | 4 +- .../apache/lucene/index/TestFieldsReader.java | 4 +- .../index/TestFilterDirectoryReader.java | 4 +- .../lucene/index/TestFilterLeafReader.java | 4 +- .../org/apache/lucene/index/TestFlex.java | 4 +- .../index/TestFlushByRamOrCountsPolicy.java | 4 +- .../lucene/index/TestForTooMuchCloning.java | 4 +- .../lucene/index/TestForceMergeForever.java | 4 +- .../apache/lucene/index/TestIndexCommit.java | 4 +- .../lucene/index/TestIndexFileDeleter.java | 4 +- .../apache/lucene/index/TestIndexInput.java | 4 +- .../lucene/index/TestIndexReaderClose.java | 4 +- .../apache/lucene/index/TestIndexWriter.java | 4 +- .../lucene/index/TestIndexWriterCommit.java | 4 +- .../lucene/index/TestIndexWriterConfig.java | 4 +- .../lucene/index/TestIndexWriterDelete.java | 4 +- .../index/TestIndexWriterDeleteByQuery.java | 4 +- .../index/TestIndexWriterExceptions.java | 4 +- .../index/TestIndexWriterExceptions2.java | 4 +- .../index/TestIndexWriterForceMerge.java | 4 +- .../index/TestIndexWriterFromReader.java | 4 +- .../index/TestIndexWriterLockRelease.java | 4 +- .../lucene/index/TestIndexWriterMaxDocs.java | 4 +- .../index/TestIndexWriterMergePolicy.java | 4 +- .../lucene/index/TestIndexWriterMerging.java | 17 ++-- .../index/TestIndexWriterNRTIsCurrent.java | 28 +++--- .../index/TestIndexWriterOnDiskFull.java | 4 +- .../index/TestIndexWriterOnJRECrash.java | 28 +++--- .../index/TestIndexWriterOnVMError.java | 4 +- .../TestIndexWriterOutOfFileDescriptors.java | 4 +- .../lucene/index/TestIndexWriterReader.java | 14 +-- .../TestIndexWriterThreadsToSegments.java | 4 +- .../lucene/index/TestIndexWriterUnicode.java | 4 +- .../index/TestIndexWriterWithThreads.java | 4 +- .../lucene/index/TestIndexableField.java | 4 +- .../apache/lucene/index/TestInfoStream.java | 4 +- .../apache/lucene/index/TestIntBlockPool.java | 4 +- .../apache/lucene/index/TestIsCurrent.java | 4 +- .../lucene/index/TestLazyProxSkipping.java | 4 +- .../lucene/index/TestLogMergePolicy.java | 4 +- .../apache/lucene/index/TestLongPostings.java | 4 +- .../apache/lucene/index/TestManyFields.java | 4 +- .../apache/lucene/index/TestMaxPosition.java | 4 +- .../lucene/index/TestMaxTermFrequency.java | 4 +- .../lucene/index/TestMergeRateLimiter.java | 4 +- .../apache/lucene/index/TestMixedCodecs.java | 4 +- .../index/TestMixedDocValuesUpdates.java | 32 +++---- .../lucene/index/TestMultiDocValues.java | 4 +- .../apache/lucene/index/TestMultiFields.java | 4 +- .../lucene/index/TestMultiLevelSkipList.java | 4 +- .../lucene/index/TestMultiTermsEnum.java | 4 +- .../lucene/index/TestNRTReaderCleanup.java | 4 +- .../index/TestNRTReaderWithThreads.java | 4 +- .../apache/lucene/index/TestNRTThreads.java | 4 +- .../apache/lucene/index/TestNeverDelete.java | 4 +- .../lucene/index/TestNewestSegment.java | 4 +- .../lucene/index/TestNoDeletionPolicy.java | 4 +- .../lucene/index/TestNoMergePolicy.java | 4 +- .../lucene/index/TestNoMergeScheduler.java | 4 +- .../org/apache/lucene/index/TestNorms.java | 4 +- .../index/TestNumericDocValuesUpdates.java | 32 +++---- .../apache/lucene/index/TestOmitNorms.java | 4 +- .../lucene/index/TestOmitPositions.java | 4 +- .../org/apache/lucene/index/TestOmitTf.java | 4 +- .../apache/lucene/index/TestOrdinalMap.java | 4 +- .../index/TestParallelCompositeReader.java | 4 +- .../lucene/index/TestParallelLeafReader.java | 4 +- .../index/TestParallelReaderEmptyIndex.java | 4 +- .../lucene/index/TestParallelTermEnum.java | 4 +- .../org/apache/lucene/index/TestPayloads.java | 4 +- .../lucene/index/TestPayloadsOnVectors.java | 4 +- .../lucene/index/TestPerSegmentDeletes.java | 4 +- .../TestPersistentSnapshotDeletionPolicy.java | 27 +++--- .../apache/lucene/index/TestPointValues.java | 4 +- .../lucene/index/TestPostingsOffsets.java | 4 +- .../lucene/index/TestPrefixCodedTerms.java | 4 +- .../lucene/index/TestReadOnlyIndex.java | 4 +- .../apache/lucene/index/TestReaderClosed.java | 4 +- .../index/TestReaderWrapperDVTypeCheck.java | 1 - .../org/apache/lucene/index/TestRollback.java | 4 +- .../lucene/index/TestRollingUpdates.java | 4 +- .../index/TestSameTokenSamePosition.java | 4 +- .../apache/lucene/index/TestSegmentInfos.java | 4 +- .../lucene/index/TestSegmentMerger.java | 4 +- .../lucene/index/TestSegmentReader.java | 4 +- .../lucene/index/TestSegmentTermDocs.java | 4 +- .../lucene/index/TestSegmentTermEnum.java | 4 +- .../index/TestSizeBoundedForceMerge.java | 4 +- .../index/TestSnapshotDeletionPolicy.java | 4 +- .../lucene/index/TestStressAdvance.java | 4 +- .../lucene/index/TestStressDeletes.java | 14 +-- .../lucene/index/TestStressIndexing.java | 14 +-- .../lucene/index/TestStressIndexing2.java | 12 +-- .../apache/lucene/index/TestStressNRT.java | 4 +- .../apache/lucene/index/TestSumDocFreq.java | 4 +- .../lucene/index/TestSwappedIndexFiles.java | 4 +- .../org/apache/lucene/index/TestTerm.java | 4 +- .../apache/lucene/index/TestTermVectors.java | 4 +- .../lucene/index/TestTermVectorsReader.java | 4 +- .../lucene/index/TestTermVectorsWriter.java | 4 +- .../apache/lucene/index/TestTermdocPerf.java | 15 ++-- .../org/apache/lucene/index/TestTerms.java | 4 +- .../apache/lucene/index/TestTermsEnum.java | 4 +- .../apache/lucene/index/TestTermsEnum2.java | 4 +- .../lucene/index/TestThreadedForceMerge.java | 4 +- .../lucene/index/TestTieredMergePolicy.java | 4 +- .../index/TestTragicIndexWriterDeadlock.java | 4 +- .../lucene/index/TestTransactionRollback.java | 4 +- .../apache/lucene/index/TestTransactions.java | 4 +- .../apache/lucene/index/TestTryDelete.java | 4 +- .../lucene/index/TestTwoPhaseCommitTool.java | 4 +- .../lucene/index/TestUniqueTermCount.java | 4 +- .../index/TestUpgradeIndexMergePolicy.java | 4 +- .../lucene/search/BaseTestRangeFilter.java | 4 +- .../lucene/search/JustCompileSearch.java | 4 +- .../lucene/search/MultiCollectorTest.java | 4 +- .../TestApproximationSearchEquivalence.java | 4 +- .../lucene/search/TestAutomatonQuery.java | 4 +- .../search/TestAutomatonQueryUnicode.java | 4 +- .../lucene/search/TestBlendedTermQuery.java | 4 +- .../apache/lucene/search/TestBoolean2.java | 4 +- .../lucene/search/TestBooleanCoord.java | 4 +- .../search/TestBooleanMinShouldMatch.java | 4 +- .../apache/lucene/search/TestBooleanOr.java | 2 +- .../lucene/search/TestBooleanQuery.java | 4 +- .../TestBooleanQueryVisitSubscorers.java | 4 +- .../lucene/search/TestBooleanRewrites.java | 4 +- .../lucene/search/TestBooleanScorer.java | 4 +- .../apache/lucene/search/TestBoostQuery.java | 4 +- .../lucene/search/TestCachingCollector.java | 4 +- .../search/TestComplexExplanations.java | 4 +- .../TestComplexExplanationsOfNonMatches.java | 4 +- .../lucene/search/TestConjunctionDISI.java | 4 +- .../lucene/search/TestConjunctions.java | 4 +- .../lucene/search/TestConstantScoreQuery.java | 4 +- .../TestControlledRealTimeReopenThread.java | 4 +- .../lucene/search/TestCustomSearcherSort.java | 14 +-- .../apache/lucene/search/TestDateSort.java | 4 +- .../search/TestDisjunctionMaxQuery.java | 4 +- .../apache/lucene/search/TestDocBoost.java | 4 +- .../search/TestDocValuesRewriteMethod.java | 4 +- .../lucene/search/TestDocValuesScoring.java | 4 +- .../lucene/search/TestEarlyTermination.java | 4 +- .../search/TestElevationComparator.java | 4 +- .../search/TestFieldCacheRewriteMethod.java | 4 +- .../lucene/search/TestFieldValueQuery.java | 4 +- .../apache/lucene/search/TestFuzzyQuery.java | 4 +- .../lucene/search/TestIndexSearcher.java | 4 +- .../lucene/search/TestLRUQueryCache.java | 4 +- .../lucene/search/TestLiveFieldValues.java | 4 +- .../lucene/search/TestMinShouldMatch2.java | 4 +- .../lucene/search/TestMultiCollector.java | 4 +- .../lucene/search/TestMultiPhraseEnum.java | 4 +- .../lucene/search/TestMultiPhraseQuery.java | 4 +- .../search/TestMultiTermConstantScore.java | 4 +- .../search/TestMultiTermQueryRewrites.java | 4 +- .../search/TestMultiThreadTermVectors.java | 4 +- .../TestMultiValuedNumericRangeQuery.java | 4 +- .../apache/lucene/search/TestMultiset.java | 4 +- .../lucene/search/TestNGramPhraseQuery.java | 4 +- .../apache/lucene/search/TestNeedsScores.java | 4 +- .../org/apache/lucene/search/TestNot.java | 4 +- .../search/TestNumericRangeQuery32.java | 4 +- .../search/TestNumericRangeQuery64.java | 4 +- .../lucene/search/TestPhrasePrefixQuery.java | 4 +- .../apache/lucene/search/TestPhraseQuery.java | 4 +- .../lucene/search/TestPointQueries.java | 4 +- .../lucene/search/TestPositionIncrement.java | 4 +- .../TestPositiveScoresOnlyCollector.java | 4 +- .../search/TestPrefixInBooleanQuery.java | 4 +- .../apache/lucene/search/TestPrefixQuery.java | 4 +- .../lucene/search/TestPrefixRandom.java | 4 +- .../lucene/search/TestQueryCachingPolicy.java | 4 +- .../lucene/search/TestQueryRescorer.java | 4 +- .../apache/lucene/search/TestRegexpQuery.java | 4 +- .../lucene/search/TestRegexpRandom.java | 4 +- .../lucene/search/TestRegexpRandom2.java | 4 +- .../lucene/search/TestReqExclBulkScorer.java | 4 +- .../search/TestSameScoresWithThreads.java | 4 +- .../TestScoreCachingWrappingScorer.java | 4 +- .../apache/lucene/search/TestScorerPerf.java | 32 +++---- .../apache/lucene/search/TestSearchAfter.java | 4 +- .../lucene/search/TestSearchWithThreads.java | 4 +- .../lucene/search/TestSearcherManager.java | 4 +- .../lucene/search/TestShardSearching.java | 4 +- .../apache/lucene/search/TestSimilarity.java | 4 +- .../lucene/search/TestSimilarityProvider.java | 4 +- .../lucene/search/TestSimpleExplanations.java | 4 +- .../TestSimpleExplanationsOfNonMatches.java | 4 +- .../search/TestSimpleSearchEquivalence.java | 14 +-- .../lucene/search/TestSloppyPhraseQuery.java | 4 +- .../lucene/search/TestSloppyPhraseQuery2.java | 4 +- .../org/apache/lucene/search/TestSort.java | 4 +- .../apache/lucene/search/TestSortRandom.java | 4 +- .../lucene/search/TestSortRescorer.java | 4 +- .../search/TestSortedNumericSortField.java | 4 +- .../lucene/search/TestSortedSetSelector.java | 4 +- .../lucene/search/TestSortedSetSortField.java | 4 +- .../lucene/search/TestSubScorerFreqs.java | 4 +- .../lucene/search/TestSynonymQuery.java | 4 +- .../lucene/search/TestTermRangeQuery.java | 4 +- .../apache/lucene/search/TestTermScorer.java | 4 +- .../search/TestTimeLimitingCollector.java | 4 +- .../lucene/search/TestTopDocsCollector.java | 4 +- .../lucene/search/TestTopDocsMerge.java | 4 +- .../lucene/search/TestTopFieldCollector.java | 4 +- .../search/TestTotalHitCountCollector.java | 4 +- .../TestUsageTrackingFilterCachingPolicy.java | 4 +- .../apache/lucene/search/TestWildcard.java | 4 +- .../lucene/search/TestWildcardRandom.java | 4 +- .../similarities/TestBM25Similarity.java | 4 +- .../similarities/TestClassicSimilarity.java | 4 +- .../search/similarities/TestSimilarity2.java | 4 +- .../similarities/TestSimilarityBase.java | 4 +- .../search/spans/JustCompileSearchSpans.java | 4 +- .../lucene/search/spans/TestBasics.java | 4 +- .../spans/TestFieldMaskingSpanQuery.java | 4 +- .../lucene/search/spans/TestFilterSpans.java | 27 +++--- .../search/spans/TestNearSpansOrdered.java | 4 +- .../search/spans/TestSpanBoostQuery.java | 10 +-- .../search/spans/TestSpanCollection.java | 4 +- .../search/spans/TestSpanContainQuery.java | 4 +- .../search/spans/TestSpanExplanations.java | 4 +- .../TestSpanExplanationsOfNonMatches.java | 4 +- .../search/spans/TestSpanFirstQuery.java | 4 +- .../spans/TestSpanMultiTermQueryWrapper.java | 4 +- .../search/spans/TestSpanNearQuery.java | 4 +- .../lucene/search/spans/TestSpanNotQuery.java | 4 +- .../lucene/search/spans/TestSpanOrQuery.java | 4 +- .../spans/TestSpanSearchEquivalence.java | 4 +- .../search/spans/TestSpanTermQuery.java | 4 +- .../apache/lucene/search/spans/TestSpans.java | 4 +- .../lucene/search/spans/TestSpansEnum.java | 4 +- .../lucene/store/TestBufferedChecksum.java | 4 +- .../lucene/store/TestBufferedIndexInput.java | 4 +- .../lucene/store/TestByteArrayDataInput.java | 4 +- .../apache/lucene/store/TestDirectory.java | 4 +- .../lucene/store/TestFileSwitchDirectory.java | 4 +- .../lucene/store/TestFilterDirectory.java | 4 +- .../apache/lucene/store/TestHugeRamFile.java | 4 +- .../apache/lucene/store/TestLockFactory.java | 4 +- .../lucene/store/TestMmapDirectory.java | 4 +- .../apache/lucene/store/TestMultiMMap.java | 4 +- .../lucene/store/TestNIOFSDirectory.java | 4 +- .../lucene/store/TestNRTCachingDirectory.java | 4 +- .../lucene/store/TestNativeFSLockFactory.java | 4 +- .../apache/lucene/store/TestRAMDirectory.java | 4 +- .../apache/lucene/store/TestRateLimiter.java | 4 +- .../lucene/store/TestSimpleFSDirectory.java | 4 +- .../lucene/store/TestSimpleFSLockFactory.java | 4 +- .../store/TestSingleInstanceLockFactory.java | 4 +- .../lucene/store/TestSleepingLockWrapper.java | 4 +- .../store/TestTrackingDirectoryWrapper.java | 4 +- .../apache/lucene/store/TestWindowsMMap.java | 4 +- .../apache/lucene/util/BaseSortTestCase.java | 4 +- .../lucene/util/StressRamUsageEstimator.java | 4 +- .../apache/lucene/util/Test2BPagedBytes.java | 4 +- .../org/apache/lucene/util/TestArrayUtil.java | 4 +- .../lucene/util/TestAttributeSource.java | 4 +- .../apache/lucene/util/TestByteBlockPool.java | 32 +++---- .../org/apache/lucene/util/TestBytesRef.java | 4 +- .../apache/lucene/util/TestBytesRefArray.java | 27 +++--- .../apache/lucene/util/TestBytesRefHash.java | 4 +- .../org/apache/lucene/util/TestCharsRef.java | 8 +- .../lucene/util/TestCharsRefBuilder.java | 4 +- .../lucene/util/TestCloseableThreadLocal.java | 1 - .../lucene/util/TestCollectionUtil.java | 4 +- .../lucene/util/TestDocIdSetBuilder.java | 4 +- .../lucene/util/TestFilterIterator.java | 1 - .../lucene/util/TestFixedBitDocIdSet.java | 1 - .../apache/lucene/util/TestFixedBitSet.java | 4 +- .../util/TestFrequencyTrackingRingBuffer.java | 4 +- .../org/apache/lucene/util/TestIOUtils.java | 4 +- .../lucene/util/TestInPlaceMergeSorter.java | 4 +- .../lucene/util/TestIntArrayDocIdSet.java | 4 +- .../apache/lucene/util/TestIntroSorter.java | 4 +- .../org/apache/lucene/util/TestIntsRef.java | 4 +- .../lucene/util/TestLSBRadixSorter.java | 4 +- .../lucene/util/TestLegacyNumericUtils.java | 4 +- .../apache/lucene/util/TestLongBitSet.java | 4 +- .../org/apache/lucene/util/TestMathUtil.java | 4 +- .../lucene/util/TestMergedIterator.java | 4 +- .../lucene/util/TestNamedSPILoader.java | 12 +-- .../apache/lucene/util/TestNotDocIdSet.java | 4 +- .../apache/lucene/util/TestOfflineSorter.java | 4 +- .../apache/lucene/util/TestPagedBytes.java | 1 - .../apache/lucene/util/TestPriorityQueue.java | 4 +- .../apache/lucene/util/TestQueryBuilder.java | 4 +- .../lucene/util/TestRamUsageEstimator.java | 4 +- .../util/TestRecyclingByteBlockAllocator.java | 18 ++-- .../util/TestRecyclingIntBlockAllocator.java | 18 ++-- .../lucene/util/TestRoaringDocIdSet.java | 4 +- .../apache/lucene/util/TestRollingBuffer.java | 8 +- .../lucene/util/TestSPIClassIterator.java | 4 +- .../lucene/util/TestSentinelIntSet.java | 6 +- .../org/apache/lucene/util/TestSetOnce.java | 4 +- .../apache/lucene/util/TestSloppyMath.java | 4 +- .../apache/lucene/util/TestSmallFloat.java | 14 +-- .../util/TestSparseFixedBitDocIdSet.java | 4 +- .../lucene/util/TestSparseFixedBitSet.java | 4 +- .../apache/lucene/util/TestStringHelper.java | 4 +- .../org/apache/lucene/util/TestTimSorter.java | 4 +- .../lucene/util/TestTimSorterWorstCase.java | 4 +- .../apache/lucene/util/TestUnicodeUtil.java | 4 +- .../org/apache/lucene/util/TestVersion.java | 4 +- .../apache/lucene/util/TestVirtualMethod.java | 4 +- .../lucene/util/TestWeakIdentityMap.java | 1 - .../automaton/FiniteStringsIteratorTest.java | 4 +- .../LimitedFiniteStringsIteratorTest.java | 4 +- .../lucene/util/automaton/TestAutomaton.java | 4 +- .../util/automaton/TestCompiledAutomaton.java | 4 +- .../util/automaton/TestDeterminism.java | 4 +- .../automaton/TestDeterminizeLexicon.java | 4 +- .../automaton/TestLevenshteinAutomata.java | 4 +- .../lucene/util/automaton/TestMinimize.java | 4 +- .../lucene/util/automaton/TestOperations.java | 4 +- .../lucene/util/automaton/TestRegExp.java | 4 +- .../util/automaton/TestUTF32ToUTF8.java | 4 +- .../org/apache/lucene/util/bkd/TestBKD.java | 4 +- .../org/apache/lucene/util/fst/Test2BFST.java | 4 +- .../lucene/util/fst/TestBytesStore.java | 4 +- .../org/apache/lucene/util/fst/TestFSTs.java | 4 +- .../util/packed/TestDirectMonotonic.java | 4 +- .../lucene/util/packed/TestDirectPacked.java | 4 +- .../lucene/util/packed/TestPackedInts.java | 4 +- .../org/apache/lucene/demo/IndexFiles.java | 4 +- .../org/apache/lucene/demo/SearchFiles.java | 4 +- .../demo/facet/AssociationsFacetsExample.java | 4 +- .../demo/facet/DistanceFacetsExample.java | 4 +- .../ExpressionAggregationFacetsExample.java | 32 +++---- .../MultiCategoryListsFacetsExample.java | 4 +- .../lucene/demo/facet/RangeFacetsExample.java | 4 +- .../demo/facet/SimpleFacetsExample.java | 4 +- .../facet/SimpleSortedSetFacetsExample.java | 4 +- .../lucene/demo/facet/package-info.java | 1 - .../org/apache/lucene/demo/package-info.java | 1 - .../demo/xmlparser/FormBasedXmlQueryDemo.java | 1 - .../lucene/demo/xmlparser/package-info.java | 1 - .../test/org/apache/lucene/demo/TestDemo.java | 4 +- .../facet/TestAssociationsFacetsExample.java | 4 +- .../demo/facet/TestDistanceFacetsExample.java | 4 +- ...estExpressionAggregationFacetsExample.java | 4 +- .../TestMultiCategoryListsFacetsExample.java | 4 +- .../demo/facet/TestRangeFacetsExample.java | 4 +- .../demo/facet/TestSimpleFacetsExample.java | 4 +- .../TestSimpleSortedSetFacetsExample.java | 4 +- .../apache/lucene/expressions/Bindings.java | 2 +- .../apache/lucene/expressions/Expression.java | 2 +- .../expressions/ExpressionComparator.java | 2 +- .../expressions/ExpressionFunctionValues.java | 2 +- .../expressions/ExpressionRescorer.java | 4 +- .../expressions/ExpressionSortField.java | 2 +- .../expressions/ExpressionValueSource.java | 2 +- .../apache/lucene/expressions/FakeScorer.java | 4 +- .../expressions/ScoreFunctionValues.java | 2 +- .../lucene/expressions/ScoreValueSource.java | 4 +- .../lucene/expressions/SimpleBindings.java | 4 +- .../expressions/js/JavascriptCompiler.java | 2 +- .../js/JavascriptErrorHandlingLexer.java | 4 +- .../js/JavascriptParserErrorStrategy.java | 4 +- .../expressions/js/VariableContext.java | 4 +- .../lucene/expressions/js/package-info.java | 1 - .../lucene/expressions/package-info.java | 1 - .../expressions/TestDemoExpressions.java | 32 +++---- .../expressions/TestExpressionRescorer.java | 4 +- .../expressions/TestExpressionSortField.java | 4 +- .../expressions/TestExpressionSorts.java | 4 +- .../expressions/TestExpressionValidation.java | 4 +- .../TestExpressionValueSource.java | 4 +- .../expressions/js/TestCustomFunctions.java | 4 +- .../js/TestJavascriptCompiler.java | 2 +- .../js/TestJavascriptFunction.java | 2 +- .../js/TestJavascriptOperations.java | 2 +- .../expressions/js/TestVariableContext.java | 4 +- .../apache/lucene/facet/DrillDownQuery.java | 3 +- .../apache/lucene/facet/DrillSideways.java | 3 +- .../lucene/facet/DrillSidewaysQuery.java | 4 +- .../lucene/facet/DrillSidewaysScorer.java | 3 +- .../org/apache/lucene/facet/FacetField.java | 3 +- .../org/apache/lucene/facet/FacetResult.java | 3 +- .../java/org/apache/lucene/facet/Facets.java | 3 +- .../apache/lucene/facet/FacetsCollector.java | 3 +- .../org/apache/lucene/facet/FacetsConfig.java | 4 +- .../apache/lucene/facet/LabelAndValue.java | 3 +- .../org/apache/lucene/facet/MultiFacets.java | 3 +- .../facet/RandomSamplingFacetsCollector.java | 3 +- .../lucene/facet/TopOrdAndFloatQueue.java | 3 +- .../lucene/facet/TopOrdAndIntQueue.java | 3 +- .../lucene/facet/range/DoubleRange.java | 3 +- .../facet/range/DoubleRangeFacetCounts.java | 3 +- .../apache/lucene/facet/range/LongRange.java | 3 +- .../lucene/facet/range/LongRangeCounter.java | 3 +- .../facet/range/LongRangeFacetCounts.java | 3 +- .../org/apache/lucene/facet/range/Range.java | 3 +- .../lucene/facet/range/RangeFacetCounts.java | 3 +- .../lucene/facet/range/package-info.java | 4 - .../DefaultSortedSetDocValuesReaderState.java | 3 +- .../SortedSetDocValuesFacetCounts.java | 3 +- .../SortedSetDocValuesFacetField.java | 3 +- .../SortedSetDocValuesReaderState.java | 3 +- .../facet/taxonomy/AssociationFacetField.java | 3 +- .../facet/taxonomy/CachedOrdinalsReader.java | 3 +- .../taxonomy/DocValuesOrdinalsReader.java | 4 +- .../lucene/facet/taxonomy/FacetLabel.java | 3 +- .../lucene/facet/taxonomy/FakeScorer.java | 3 +- .../taxonomy/FastTaxonomyFacetCounts.java | 3 +- .../taxonomy/FloatAssociationFacetField.java | 3 +- .../facet/taxonomy/FloatTaxonomyFacets.java | 3 +- .../taxonomy/IntAssociationFacetField.java | 3 +- .../facet/taxonomy/IntTaxonomyFacets.java | 3 +- .../lucene/facet/taxonomy/LRUHashMap.java | 3 +- .../taxonomy/OrdinalMappingLeafReader.java | 3 +- .../lucene/facet/taxonomy/OrdinalsReader.java | 3 +- .../taxonomy/ParallelTaxonomyArrays.java | 4 +- .../facet/taxonomy/PrintTaxonomyStats.java | 3 +- .../taxonomy/SearcherTaxonomyManager.java | 3 +- .../facet/taxonomy/TaxonomyFacetCounts.java | 3 +- .../TaxonomyFacetSumFloatAssociations.java | 3 +- .../TaxonomyFacetSumIntAssociations.java | 3 +- .../taxonomy/TaxonomyFacetSumValueSource.java | 3 +- .../lucene/facet/taxonomy/TaxonomyFacets.java | 3 +- .../facet/taxonomy/TaxonomyMergeUtils.java | 31 +++---- .../lucene/facet/taxonomy/TaxonomyReader.java | 17 ++-- .../lucene/facet/taxonomy/TaxonomyWriter.java | 15 ++-- .../facet/taxonomy/directory/Consts.java | 7 +- .../directory/DirectoryTaxonomyReader.java | 33 ++++--- .../directory/DirectoryTaxonomyWriter.java | 33 ++++--- .../directory/TaxonomyIndexArrays.java | 25 +++--- .../writercache/CategoryPathUtils.java | 7 +- .../taxonomy/writercache/CharBlockArray.java | 21 +++-- .../writercache/Cl2oTaxonomyWriterCache.java | 15 ++-- .../taxonomy/writercache/CollisionMap.java | 13 ++- .../writercache/CompactLabelToOrdinal.java | 3 +- .../taxonomy/writercache/LabelToOrdinal.java | 7 +- .../writercache/LruTaxonomyWriterCache.java | 9 +- .../writercache/NameHashIntCacheLRU.java | 7 +- .../taxonomy/writercache/NameIntCacheLRU.java | 13 ++- .../writercache/TaxonomyWriterCache.java | 9 +- .../AssertingSubDocsAtOnceCollector.java | 3 +- .../apache/lucene/facet/FacetTestCase.java | 3 +- .../apache/lucene/facet/SlowRAMDirectory.java | 3 +- .../lucene/facet/TestDrillDownQuery.java | 3 +- .../lucene/facet/TestDrillSideways.java | 3 +- .../apache/lucene/facet/TestFacetsConfig.java | 3 +- .../lucene/facet/TestMultipleIndexFields.java | 3 +- .../TestRandomSamplingFacetsCollector.java | 33 ++++--- .../facet/range/TestRangeFacetCounts.java | 3 +- .../TestSortedSetDocValuesFacets.java | 3 +- .../taxonomy/TestCachedOrdinalsReader.java | 3 +- .../lucene/facet/taxonomy/TestFacetLabel.java | 21 +++-- .../lucene/facet/taxonomy/TestLRUHashMap.java | 3 +- .../TestOrdinalMappingLeafReader.java | 33 ++++--- .../taxonomy/TestSearcherTaxonomyManager.java | 3 +- .../facet/taxonomy/TestTaxonomyCombined.java | 33 ++++--- .../TestTaxonomyFacetAssociations.java | 4 +- .../taxonomy/TestTaxonomyFacetCounts.java | 3 +- .../taxonomy/TestTaxonomyFacetCounts2.java | 3 +- .../TestTaxonomyFacetSumValueSource.java | 3 +- .../taxonomy/directory/TestAddTaxonomy.java | 31 ++++--- .../TestConcurrentFacetedIndexing.java | 33 ++++--- .../TestDirectoryTaxonomyReader.java | 33 ++++--- .../TestDirectoryTaxonomyWriter.java | 32 +++---- .../writercache/TestCharBlockArray.java | 30 +++---- .../TestCompactLabelToOrdinal.java | 33 ++++--- .../AbstractAllGroupHeadsCollector.java | 3 +- .../grouping/AbstractAllGroupsCollector.java | 3 +- .../AbstractDistinctValuesCollector.java | 3 +- .../AbstractFirstPassGroupingCollector.java | 3 +- .../grouping/AbstractGroupFacetCollector.java | 3 +- .../AbstractSecondPassGroupingCollector.java | 3 +- .../grouping/BlockGroupingCollector.java | 3 +- .../search/grouping/CollectedSearchGroup.java | 1 - .../lucene/search/grouping/FakeScorer.java | 3 +- .../lucene/search/grouping/GroupDocs.java | 3 +- .../search/grouping/GroupingSearch.java | 3 +- .../lucene/search/grouping/SearchGroup.java | 3 +- .../lucene/search/grouping/TopGroups.java | 3 +- .../FunctionAllGroupHeadsCollector.java | 3 +- .../function/FunctionAllGroupsCollector.java | 3 +- .../FunctionDistinctValuesCollector.java | 3 +- .../FunctionFirstPassGroupingCollector.java | 3 +- .../FunctionSecondPassGroupingCollector.java | 3 +- .../grouping/function/package-info.java | 1 - .../lucene/search/grouping/package-info.java | 1 - .../term/TermAllGroupHeadsCollector.java | 3 +- .../grouping/term/TermAllGroupsCollector.java | 3 +- .../term/TermDistinctValuesCollector.java | 3 +- .../term/TermFirstPassGroupingCollector.java | 3 +- .../term/TermGroupFacetCollector.java | 3 +- .../term/TermSecondPassGroupingCollector.java | 3 +- .../search/grouping/term/package-info.java | 1 - .../grouping/AbstractGroupingTestCase.java | 3 +- .../grouping/AllGroupHeadsCollectorTest.java | 3 +- .../grouping/AllGroupsCollectorTest.java | 5 +- .../grouping/DistinctValuesCollectorTest.java | 3 +- .../grouping/GroupFacetCollectorTest.java | 3 +- .../search/grouping/GroupingSearchTest.java | 3 +- .../lucene/search/grouping/TestGrouping.java | 1 - .../search/highlight/DefaultEncoder.java | 22 +++-- .../lucene/search/highlight/Encoder.java | 17 ++-- .../lucene/search/highlight/Formatter.java | 4 +- .../lucene/search/highlight/Fragmenter.java | 3 +- .../search/highlight/GradientFormatter.java | 3 +- .../lucene/search/highlight/Highlighter.java | 3 +- .../InvalidTokenOffsetsException.java | 3 +- .../search/highlight/NullFragmenter.java | 3 +- .../highlight/OffsetLimitTokenFilter.java | 3 +- .../lucene/search/highlight/PositionSpan.java | 3 +- .../lucene/search/highlight/QueryScorer.java | 3 +- .../search/highlight/QueryTermExtractor.java | 3 +- .../search/highlight/QueryTermScorer.java | 3 +- .../lucene/search/highlight/Scorer.java | 3 +- .../search/highlight/SimpleFragmenter.java | 3 +- .../search/highlight/SimpleHTMLEncoder.java | 19 ++-- .../search/highlight/SimpleHTMLFormatter.java | 3 +- .../highlight/SimpleSpanFragmenter.java | 6 +- .../highlight/SpanGradientFormatter.java | 3 +- .../highlight/TermVectorLeafReader.java | 3 +- .../lucene/search/highlight/TextFragment.java | 4 +- .../lucene/search/highlight/TokenGroup.java | 3 +- .../lucene/search/highlight/TokenSources.java | 3 +- .../highlight/TokenStreamFromTermVector.java | 3 +- .../search/highlight/WeightedSpanTerm.java | 6 +- .../highlight/WeightedSpanTermExtractor.java | 3 +- .../lucene/search/highlight/WeightedTerm.java | 3 +- .../lucene/search/highlight/package-info.java | 1 - .../CustomSeparatorBreakIterator.java | 9 +- .../DefaultPassageFormatter.java | 3 +- .../MultiTermHighlighting.java | 3 +- .../search/postingshighlight/Passage.java | 3 +- .../postingshighlight/PassageFormatter.java | 3 +- .../postingshighlight/PassageScorer.java | 3 +- .../PostingsHighlighter.java | 3 +- .../postingshighlight/WholeBreakIterator.java | 3 +- .../postingshighlight/package-info.java | 1 - .../vectorhighlight/BaseFragListBuilder.java | 3 +- .../vectorhighlight/BaseFragmentsBuilder.java | 3 +- .../vectorhighlight/BoundaryScanner.java | 3 +- .../BreakIteratorBoundaryScanner.java | 3 +- .../FastVectorHighlighter.java | 3 +- .../search/vectorhighlight/FieldFragList.java | 3 +- .../vectorhighlight/FieldPhraseList.java | 3 +- .../search/vectorhighlight/FieldQuery.java | 3 +- .../vectorhighlight/FieldTermStack.java | 3 +- .../vectorhighlight/FragListBuilder.java | 3 +- .../vectorhighlight/FragmentsBuilder.java | 3 +- .../ScoreOrderFragmentsBuilder.java | 3 +- .../SimpleBoundaryScanner.java | 3 +- .../vectorhighlight/SimpleFieldFragList.java | 3 +- .../SimpleFragListBuilder.java | 4 +- .../SimpleFragmentsBuilder.java | 3 +- .../SingleFragListBuilder.java | 3 +- .../WeightedFieldFragList.java | 3 +- .../WeightedFragListBuilder.java | 3 +- .../search/vectorhighlight/package-info.java | 1 - .../highlight/HighlighterPhraseTest.java | 3 +- .../search/highlight/HighlighterTest.java | 3 +- .../lucene/search/highlight/MissesTest.java | 3 +- .../highlight/OffsetLimitTokenFilterTest.java | 3 +- .../search/highlight/TokenSourcesTest.java | 3 +- .../custom/HighlightCustomQueryTest.java | 4 +- .../TestCustomSeparatorBreakIterator.java | 3 +- .../TestMultiTermHighlighting.java | 3 +- .../TestPostingsHighlighter.java | 3 +- .../TestPostingsHighlighterRanking.java | 3 +- .../TestWholeBreakIterator.java | 3 +- .../vectorhighlight/AbstractTestCase.java | 3 +- .../BreakIteratorBoundaryScannerTest.java | 3 +- .../FastVectorHighlighterTest.java | 2 +- .../vectorhighlight/FieldPhraseListTest.java | 3 +- .../vectorhighlight/FieldQueryTest.java | 3 +- .../vectorhighlight/FieldTermStackTest.java | 3 +- .../vectorhighlight/IndexTimeSynonymTest.java | 3 +- .../ScoreOrderFragmentsBuilderTest.java | 3 +- .../SimpleBoundaryScannerTest.java | 3 +- .../SimpleFragListBuilderTest.java | 3 +- .../SimpleFragmentsBuilderTest.java | 3 +- .../SingleFragListBuilderTest.java | 11 ++- .../WeightedFragListBuilderTest.java | 3 +- .../search/join/BaseGlobalOrdinalScorer.java | 3 +- .../lucene/search/join/BitSetProducer.java | 3 +- .../lucene/search/join/BlockJoinSelector.java | 3 +- .../lucene/search/join/CheckJoinIndex.java | 3 +- .../search/join/DocValuesTermsCollector.java | 33 ++++--- .../apache/lucene/search/join/FakeScorer.java | 3 +- .../search/join/GenericTermsCollector.java | 31 ++++--- .../search/join/GlobalOrdinalsCollector.java | 3 +- .../search/join/GlobalOrdinalsQuery.java | 3 +- .../GlobalOrdinalsWithScoreCollector.java | 3 +- .../join/GlobalOrdinalsWithScoreQuery.java | 3 +- .../apache/lucene/search/join/JoinUtil.java | 17 ++-- .../search/join/QueryBitSetProducer.java | 3 +- .../apache/lucene/search/join/ScoreMode.java | 3 +- .../lucene/search/join/TermsCollector.java | 3 +- .../search/join/TermsIncludingScoreQuery.java | 3 +- .../apache/lucene/search/join/TermsQuery.java | 3 +- .../search/join/TermsWithScoreCollector.java | 9 +- .../search/join/ToChildBlockJoinQuery.java | 3 +- .../join/ToParentBlockJoinCollector.java | 3 +- .../join/ToParentBlockJoinIndexSearcher.java | 3 +- .../search/join/ToParentBlockJoinQuery.java | 3 +- .../join/ToParentBlockJoinSortField.java | 3 +- .../lucene/search/join/package-info.java | 1 - .../lucene/search/join/TestBlockJoin.java | 3 +- .../search/join/TestBlockJoinSelector.java | 4 +- .../search/join/TestBlockJoinSorting.java | 3 +- .../search/join/TestBlockJoinValidation.java | 3 +- .../search/join/TestCheckJoinIndex.java | 3 +- .../lucene/search/join/TestJoinUtil.java | 33 ++++--- .../lucene/index/memory/MemoryIndex.java | 3 +- .../lucene/index/memory/package-info.java | 1 - .../lucene/index/memory/TestMemoryIndex.java | 3 +- .../memory/TestMemoryIndexAgainstRAMDir.java | 3 +- .../apache/lucene/document/LazyDocument.java | 15 ++-- .../lucene/index/MergeReaderWrapper.java | 3 +- .../lucene/index/MultiPassIndexSplitter.java | 3 +- .../apache/lucene/index/PKIndexSplitter.java | 3 +- .../java/org/apache/lucene/index/Sorter.java | 3 +- .../lucene/index/SortingLeafReader.java | 3 +- .../lucene/index/SortingMergePolicy.java | 3 +- .../org/apache/lucene/misc/GetTermInfo.java | 3 +- .../org/apache/lucene/misc/HighFreqTerms.java | 3 +- .../apache/lucene/misc/IndexMergeTool.java | 14 +-- .../lucene/misc/SweetSpotSimilarity.java | 1 - .../org/apache/lucene/misc/TermStats.java | 3 +- .../org/apache/lucene/misc/package-info.java | 1 - .../search/BlockJoinComparatorSource.java | 3 +- .../search/DiversifiedTopDocsCollector.java | 4 +- .../EarlyTerminatingSortingCollector.java | 3 +- .../apache/lucene/store/NativePosixUtil.java | 3 +- .../lucene/store/NativeUnixDirectory.java | 27 +++--- .../org/apache/lucene/store/RAFDirectory.java | 3 +- .../apache/lucene/store/WindowsDirectory.java | 27 +++--- .../lucene/uninverting/DocTermOrds.java | 1 - .../apache/lucene/uninverting/FieldCache.java | 3 +- .../lucene/uninverting/FieldCacheImpl.java | 3 +- .../uninverting/FieldCacheSanityChecker.java | 13 +-- .../lucene/uninverting/UninvertingReader.java | 3 +- .../lucene/uninverting/package-info.java | 1 - .../apache/lucene/util/fst/ListOfOutputs.java | 3 +- .../util/fst/UpToTwoPositiveIntOutputs.java | 3 +- .../apache/lucene/index/IndexSortingTest.java | 3 +- .../apache/lucene/index/SorterTestBase.java | 3 +- .../lucene/index/SortingLeafReaderTest.java | 3 +- .../lucene/index/TestBlockJoinSorter.java | 3 +- .../index/TestMultiPassIndexSplitter.java | 3 +- .../lucene/index/TestPKIndexSplitter.java | 27 +++--- .../lucene/index/TestSortingMergePolicy.java | 3 +- .../lucene/misc/SweetSpotSimilarityTest.java | 3 - .../apache/lucene/misc/TestHighFreqTerms.java | 3 +- .../TestDiversifiedTopDocsCollector.java | 3 +- .../TestEarlyTerminatingSortingCollector.java | 3 +- .../apache/lucene/store/TestRAFDirectory.java | 3 +- .../lucene/uninverting/TestDocTermOrds.java | 3 +- .../lucene/uninverting/TestFieldCache.java | 14 +-- .../uninverting/TestFieldCacheReopen.java | 3 +- .../TestFieldCacheSanityChecker.java | 14 +-- .../uninverting/TestFieldCacheSort.java | 3 +- .../uninverting/TestFieldCacheSortRandom.java | 3 +- .../TestFieldCacheVsDocValues.java | 3 +- .../TestFieldCacheWithThreads.java | 3 +- .../uninverting/TestNumericTerms32.java | 3 +- .../uninverting/TestNumericTerms64.java | 3 +- .../uninverting/TestUninvertingReader.java | 3 +- .../apache/lucene/util/fst/TestFSTsMisc.java | 3 +- .../apache/lucene/queries/BoostingQuery.java | 3 +- .../lucene/queries/CommonTermsQuery.java | 4 +- .../lucene/queries/CustomScoreProvider.java | 3 +- .../lucene/queries/CustomScoreQuery.java | 3 +- .../org/apache/lucene/queries/TermsQuery.java | 3 +- .../lucene/queries/function/BoostedQuery.java | 3 +- .../queries/function/FunctionQuery.java | 3 +- .../queries/function/FunctionRangeQuery.java | 3 +- .../queries/function/FunctionValues.java | 3 +- .../lucene/queries/function/ValueSource.java | 3 +- .../queries/function/ValueSourceScorer.java | 3 +- .../function/docvalues/BoolDocValues.java | 3 +- .../docvalues/DocTermsIndexDocValues.java | 1 - .../function/docvalues/DoubleDocValues.java | 3 +- .../function/docvalues/FloatDocValues.java | 3 +- .../function/docvalues/IntDocValues.java | 3 +- .../function/docvalues/LongDocValues.java | 3 +- .../function/docvalues/StrDocValues.java | 3 +- .../function/docvalues/package-info.java | 1 - .../lucene/queries/function/package-info.java | 1 - .../function/valuesource/BoolFunction.java | 1 - .../valuesource/BytesRefFieldSource.java | 3 +- .../valuesource/ConstNumberSource.java | 1 - .../valuesource/ConstValueSource.java | 1 - .../function/valuesource/DefFunction.java | 3 +- .../valuesource/DivFloatFunction.java | 1 - .../valuesource/DocFreqValueSource.java | 1 - .../valuesource/DoubleConstValueSource.java | 1 - .../valuesource/DoubleFieldSource.java | 1 - .../valuesource/DualFloatFunction.java | 1 - .../function/valuesource/EnumFieldSource.java | 3 +- .../valuesource/FieldCacheSource.java | 1 - .../valuesource/FloatFieldSource.java | 1 - .../function/valuesource/IDFValueSource.java | 1 - .../function/valuesource/IfFunction.java | 1 - .../function/valuesource/IntFieldSource.java | 1 - .../valuesource/JoinDocFreqValueSource.java | 1 - .../valuesource/LinearFloatFunction.java | 1 - .../valuesource/LiteralValueSource.java | 3 +- .../function/valuesource/LongFieldSource.java | 1 - .../valuesource/MaxFloatFunction.java | 1 - .../valuesource/MinFloatFunction.java | 1 - .../valuesource/MultiBoolFunction.java | 1 - .../valuesource/MultiFloatFunction.java | 3 +- .../function/valuesource/MultiFunction.java | 3 +- .../valuesource/MultiValueSource.java | 3 +- .../function/valuesource/NormValueSource.java | 1 - .../valuesource/PowFloatFunction.java | 1 - .../valuesource/ProductFloatFunction.java | 1 - .../valuesource/QueryValueSource.java | 1 - .../valuesource/RangeMapFloatFunction.java | 1 - .../valuesource/ReciprocalFloatFunction.java | 1 - .../valuesource/ScaleFloatFunction.java | 1 - .../valuesource/SimpleBoolFunction.java | 1 - .../valuesource/SimpleFloatFunction.java | 1 - .../function/valuesource/SingleFunction.java | 1 - .../valuesource/SortedSetFieldSource.java | 3 +- .../valuesource/SumFloatFunction.java | 1 - .../SumTotalTermFreqValueSource.java | 1 - .../function/valuesource/TFValueSource.java | 3 +- .../valuesource/TermFreqValueSource.java | 1 - .../valuesource/TotalTermFreqValueSource.java | 1 - .../valuesource/VectorValueSource.java | 3 +- .../function/valuesource/package-info.java | 1 - .../lucene/queries/mlt/MoreLikeThis.java | 14 +-- .../lucene/queries/mlt/MoreLikeThisQuery.java | 6 +- .../lucene/queries/mlt/package-info.java | 1 - .../apache/lucene/queries/package-info.java | 1 - .../payloads/AveragePayloadFunction.java | 4 +- .../queries/payloads/MaxPayloadFunction.java | 4 +- .../queries/payloads/MinPayloadFunction.java | 3 +- .../queries/payloads/PayloadFunction.java | 3 +- .../queries/payloads/PayloadScoreQuery.java | 3 +- .../payloads/SpanPayloadCheckQuery.java | 3 +- .../lucene/queries/payloads/package-info.java | 1 - .../lucene/queries/BoostingQueryTest.java | 3 +- .../lucene/queries/CommonTermsQueryTest.java | 3 +- .../apache/lucene/queries/TermsQueryTest.java | 3 +- .../queries/TestCustomScoreExplanations.java | 3 +- .../lucene/queries/TestCustomScoreQuery.java | 3 +- .../queries/function/FunctionTestSetup.java | 32 +++---- .../queries/function/TestBoostedQuery.java | 33 ++++--- .../function/TestDocValuesFieldSources.java | 3 +- .../queries/function/TestFieldScoreQuery.java | 3 +- .../TestFunctionQueryExplanations.java | 3 +- .../function/TestFunctionQuerySort.java | 3 +- .../function/TestFunctionRangeQuery.java | 3 +- .../function/TestLongNormValueSource.java | 3 +- .../function/TestSortedSetFieldSource.java | 3 +- .../queries/function/TestValueSources.java | 3 +- .../lucene/queries/mlt/TestMoreLikeThis.java | 3 +- .../queries/payloads/PayloadHelper.java | 3 +- .../payloads/TestPayloadCheckQuery.java | 3 +- .../payloads/TestPayloadExplanations.java | 3 +- .../payloads/TestPayloadScoreQuery.java | 3 +- .../queries/payloads/TestPayloadSpans.java | 14 +-- .../payloads/TestPayloadTermQuery.java | 3 +- .../analyzing/AnalyzingQueryParser.java | 3 +- .../queryparser/analyzing/package-info.java | 1 - .../queryparser/classic/FastCharStream.java | 5 +- .../classic/MultiFieldQueryParser.java | 3 +- .../queryparser/classic/QueryParserBase.java | 1 - .../queryparser/classic/package-info.java | 2 - .../ComplexPhraseQueryParser.java | 3 +- .../complexPhrase/package-info.java | 1 - .../ext/ExtendableQueryParser.java | 3 +- .../queryparser/ext/ExtensionQuery.java | 7 +- .../lucene/queryparser/ext/Extensions.java | 4 +- .../queryparser/ext/ParserExtension.java | 3 +- .../lucene/queryparser/ext/package-info.java | 1 - .../flexible/core/QueryNodeError.java | 3 +- .../flexible/core/QueryNodeException.java | 3 +- .../core/QueryNodeParseException.java | 3 +- .../flexible/core/QueryParserHelper.java | 16 ++-- .../flexible/core/builders/QueryBuilder.java | 8 +- .../core/builders/QueryTreeBuilder.java | 3 +- .../flexible/core/builders/package-info.java | 1 - .../core/config/AbstractQueryConfig.java | 3 +- .../core/config/ConfigurationKey.java | 3 +- .../flexible/core/config/FieldConfig.java | 3 +- .../core/config/FieldConfigListener.java | 3 +- .../core/config/QueryConfigHandler.java | 3 +- .../flexible/core/config/package-info.java | 1 - .../core/messages/QueryParserMessages.java | 3 +- .../flexible/core/messages/package-info.java | 1 - .../flexible/core/nodes/AndQueryNode.java | 3 +- .../flexible/core/nodes/AnyQueryNode.java | 3 +- .../flexible/core/nodes/BooleanQueryNode.java | 3 +- .../flexible/core/nodes/BoostQueryNode.java | 3 +- .../flexible/core/nodes/DeletedQueryNode.java | 7 +- .../flexible/core/nodes/FieldQueryNode.java | 3 +- .../core/nodes/FieldValuePairQueryNode.java | 3 +- .../flexible/core/nodes/FieldableNode.java | 3 +- .../flexible/core/nodes/FuzzyQueryNode.java | 3 +- .../flexible/core/nodes/GroupQueryNode.java | 3 +- .../core/nodes/MatchAllDocsQueryNode.java | 3 +- .../core/nodes/MatchNoDocsQueryNode.java | 3 +- .../core/nodes/ModifierQueryNode.java | 3 +- .../core/nodes/NoTokenFoundQueryNode.java | 3 +- .../flexible/core/nodes/OpaqueQueryNode.java | 3 +- .../flexible/core/nodes/OrQueryNode.java | 3 +- .../flexible/core/nodes/PathQueryNode.java | 3 +- .../core/nodes/PhraseSlopQueryNode.java | 3 +- .../core/nodes/ProximityQueryNode.java | 3 +- .../flexible/core/nodes/QueryNode.java | 3 +- .../flexible/core/nodes/QueryNodeImpl.java | 3 +- .../core/nodes/QuotedFieldQueryNode.java | 3 +- .../flexible/core/nodes/RangeQueryNode.java | 7 +- .../flexible/core/nodes/SlopQueryNode.java | 3 +- .../core/nodes/TextableQueryNode.java | 27 +++--- .../core/nodes/TokenizedPhraseQueryNode.java | 3 +- .../flexible/core/nodes/ValueQueryNode.java | 27 +++--- .../flexible/core/nodes/package-info.java | 1 - .../flexible/core/package-info.java | 1 - .../core/parser/EscapeQuerySyntax.java | 3 +- .../flexible/core/parser/SyntaxParser.java | 3 +- .../flexible/core/parser/package-info.java | 1 - ...NoChildOptimizationQueryNodeProcessor.java | 3 +- .../core/processors/QueryNodeProcessor.java | 3 +- .../processors/QueryNodeProcessorImpl.java | 3 +- .../QueryNodeProcessorPipeline.java | 3 +- .../RemoveDeletedQueryNodesProcessor.java | 3 +- .../core/processors/package-info.java | 1 - .../core/util/QueryNodeOperation.java | 3 +- .../flexible/core/util/StringUtils.java | 3 +- .../core/util/UnescapedCharSequence.java | 7 +- .../flexible/core/util/package-info.java | 1 - .../flexible/messages/Message.java | 3 +- .../flexible/messages/MessageImpl.java | 3 +- .../queryparser/flexible/messages/NLS.java | 3 +- .../flexible/messages/NLSException.java | 3 +- .../flexible/messages/package-info.java | 1 - .../precedence/PrecedenceQueryParser.java | 3 +- .../flexible/precedence/package-info.java | 1 - .../BooleanModifiersQueryNodeProcessor.java | 3 +- .../PrecedenceQueryNodeProcessorPipeline.java | 3 +- .../CommonQueryParserConfiguration.java | 23 +++-- .../flexible/standard/QueryParserUtil.java | 3 +- .../standard/StandardQueryParser.java | 3 +- .../builders/AnyQueryNodeBuilder.java | 3 +- .../builders/BooleanQueryNodeBuilder.java | 3 +- .../builders/BoostQueryNodeBuilder.java | 3 +- .../builders/DummyQueryNodeBuilder.java | 3 +- .../builders/FieldQueryNodeBuilder.java | 3 +- .../builders/FuzzyQueryNodeBuilder.java | 3 +- .../builders/GroupQueryNodeBuilder.java | 3 +- .../MatchAllDocsQueryNodeBuilder.java | 3 +- .../builders/MatchNoDocsQueryNodeBuilder.java | 3 +- .../builders/ModifierQueryNodeBuilder.java | 3 +- .../builders/MultiPhraseQueryNodeBuilder.java | 3 +- .../NumericRangeQueryNodeBuilder.java | 3 +- .../builders/PhraseQueryNodeBuilder.java | 3 +- .../PrefixWildcardQueryNodeBuilder.java | 3 +- .../builders/RegexpQueryNodeBuilder.java | 3 +- .../builders/SlopQueryNodeBuilder.java | 3 +- .../StandardBooleanQueryNodeBuilder.java | 3 +- .../builders/StandardQueryBuilder.java | 3 +- .../builders/StandardQueryTreeBuilder.java | 3 +- .../builders/TermRangeQueryNodeBuilder.java | 3 +- .../builders/WildcardQueryNodeBuilder.java | 3 +- .../standard/builders/package-info.java | 1 - .../config/FieldBoostMapFCListener.java | 3 +- .../config/FieldDateResolutionFCListener.java | 3 +- .../flexible/standard/config/FuzzyConfig.java | 3 +- .../standard/config/NumberDateFormat.java | 3 +- .../standard/config/NumericConfig.java | 3 +- .../config/NumericFieldConfigListener.java | 3 +- .../config/StandardQueryConfigHandler.java | 3 +- .../standard/config/package-info.java | 1 - .../nodes/AbstractRangeQueryNode.java | 3 +- .../standard/nodes/BooleanModifierNode.java | 3 +- .../standard/nodes/MultiPhraseQueryNode.java | 3 +- .../standard/nodes/NumericQueryNode.java | 3 +- .../standard/nodes/NumericRangeQueryNode.java | 27 +++--- .../nodes/PrefixWildcardQueryNode.java | 7 +- .../standard/nodes/RegexpQueryNode.java | 3 +- .../nodes/StandardBooleanQueryNode.java | 3 +- .../standard/nodes/TermRangeQueryNode.java | 3 +- .../standard/nodes/WildcardQueryNode.java | 3 +- .../flexible/standard/nodes/package-info.java | 1 - .../flexible/standard/package-info.java | 1 - .../parser/EscapeQuerySyntaxImpl.java | 3 +- .../standard/parser/FastCharStream.java | 5 +- .../standard/parser/package-info.java | 1 - .../AllowLeadingWildcardProcessor.java | 3 +- .../AnalyzerQueryNodeProcessor.java | 3 +- .../BooleanQuery2ModifierNodeProcessor.java | 3 +- ...leChildOptimizationQueryNodeProcessor.java | 3 +- .../processors/BoostQueryNodeProcessor.java | 3 +- .../DefaultPhraseSlopQueryNodeProcessor.java | 3 +- .../processors/FuzzyQueryNodeProcessor.java | 3 +- ...ercaseExpandedTermsQueryNodeProcessor.java | 3 +- .../MatchAllDocsQueryNodeProcessor.java | 3 +- .../MultiFieldQueryNodeProcessor.java | 3 +- .../MultiTermRewriteMethodProcessor.java | 3 +- .../processors/NumericQueryNodeProcessor.java | 3 +- .../NumericRangeQueryNodeProcessor.java | 3 +- .../OpenRangeQueryNodeProcessor.java | 3 +- .../PhraseSlopQueryNodeProcessor.java | 3 +- .../RemoveEmptyNonLeafQueryNodeProcessor.java | 3 +- .../StandardQueryNodeProcessorPipeline.java | 3 +- .../TermRangeQueryNodeProcessor.java | 3 +- .../WildcardQueryNodeProcessor.java | 3 +- .../standard/processors/package-info.java | 1 - .../queryparser/simple/SimpleQueryParser.java | 3 +- .../queryparser/simple/package-info.java | 1 - .../surround/parser/FastCharStream.java | 3 +- .../surround/parser/package-info.java | 1 - .../queryparser/surround/query/AndQuery.java | 4 +- .../surround/query/BasicQueryFactory.java | 3 +- .../surround/query/ComposedQuery.java | 3 +- .../surround/query/DistanceQuery.java | 3 +- .../surround/query/DistanceRewriteQuery.java | 3 +- .../surround/query/DistanceSubQuery.java | 3 +- .../surround/query/FieldsQuery.java | 3 +- .../queryparser/surround/query/NotQuery.java | 3 +- .../queryparser/surround/query/OrQuery.java | 3 +- .../surround/query/RewriteQuery.java | 2 +- .../surround/query/SimpleTerm.java | 3 +- .../query/SimpleTermRewriteQuery.java | 2 +- .../surround/query/SpanNearClauseFactory.java | 3 +- .../surround/query/SrndBooleanQuery.java | 3 +- .../surround/query/SrndPrefixQuery.java | 3 +- .../queryparser/surround/query/SrndQuery.java | 3 +- .../surround/query/SrndTermQuery.java | 3 +- .../surround/query/SrndTruncQuery.java | 3 +- .../surround/query/TooManyBasicQueries.java | 3 +- .../surround/query/package-info.java | 1 - .../lucene/queryparser/xml/CoreParser.java | 27 +++--- .../xml/CorePlusExtensionsParser.java | 11 ++- .../xml/CorePlusQueriesParser.java | 13 ++- .../lucene/queryparser/xml/DOMUtils.java | 19 ++-- .../queryparser/xml/ParserException.java | 5 +- .../lucene/queryparser/xml/QueryBuilder.java | 8 +- .../queryparser/xml/QueryBuilderFactory.java | 15 ++-- .../queryparser/xml/QueryTemplateManager.java | 33 ++++--- .../xml/builders/BooleanQueryBuilder.java | 27 +++--- .../xml/builders/BoostingQueryBuilder.java | 17 ++-- .../xml/builders/BoostingTermBuilder.java | 23 +++-- .../builders/ConstantScoreQueryBuilder.java | 19 ++-- .../builders/DisjunctionMaxQueryBuilder.java | 3 +- .../builders/FuzzyLikeThisQueryBuilder.java | 25 +++--- .../LegacyNumericRangeQueryBuilder.java | 3 +- .../xml/builders/LikeThisQueryBuilder.java | 31 +++---- .../builders/MatchAllDocsQueryBuilder.java | 13 ++- .../xml/builders/RangeQueryBuilder.java | 6 +- .../xml/builders/SpanBuilderBase.java | 11 ++- .../xml/builders/SpanFirstBuilder.java | 15 ++-- .../xml/builders/SpanNearBuilder.java | 23 +++-- .../xml/builders/SpanNotBuilder.java | 15 ++-- .../xml/builders/SpanOrBuilder.java | 23 +++-- .../xml/builders/SpanOrTermsBuilder.java | 33 ++++--- .../xml/builders/SpanQueryBuilder.java | 3 +- .../xml/builders/SpanQueryBuilderFactory.java | 17 ++-- .../xml/builders/SpanTermBuilder.java | 17 ++-- .../xml/builders/TermQueryBuilder.java | 19 ++-- .../xml/builders/TermsQueryBuilder.java | 33 ++++--- .../xml/builders/UserInputQueryBuilder.java | 23 +++-- .../xml/builders/package-info.java | 1 - .../lucene/queryparser/xml/package-info.java | 1 - .../analyzing/TestAnalyzingQueryParser.java | 3 +- .../classic/TestMultiAnalyzer.java | 3 +- .../classic/TestMultiFieldQueryParser.java | 3 +- .../classic/TestMultiPhraseQueryParsing.java | 3 +- .../queryparser/classic/TestQueryParser.java | 3 +- .../complexPhrase/TestComplexPhraseQuery.java | 3 +- .../lucene/queryparser/ext/ExtensionStub.java | 13 ++- .../ext/TestExtendableQueryParser.java | 3 +- .../queryparser/ext/TestExtensions.java | 3 +- .../core/builders/TestQueryTreeBuilder.java | 3 +- .../flexible/core/nodes/TestQueryNode.java | 3 +- .../flexible/messages/MessagesTestBundle.java | 27 +++--- .../flexible/messages/TestNLS.java | 3 +- .../precedence/TestPrecedenceQueryParser.java | 3 +- .../spans/SpanOrQueryNodeBuilder.java | 3 +- .../spans/SpanTermQueryNodeBuilder.java | 3 +- .../spans/SpansQueryConfigHandler.java | 3 +- .../flexible/spans/SpansQueryTreeBuilder.java | 3 +- .../SpansValidatorQueryNodeProcessor.java | 3 +- .../flexible/spans/TestSpanQueryParser.java | 3 +- .../TestSpanQueryParserSimpleSample.java | 3 +- .../flexible/spans/UniqueFieldAttribute.java | 3 +- .../spans/UniqueFieldAttributeImpl.java | 3 +- .../spans/UniqueFieldQueryNodeProcessor.java | 3 +- .../standard/TestMultiAnalyzerQPHelper.java | 3 +- .../standard/TestMultiFieldQPHelper.java | 3 +- .../standard/TestNumericQueryParser.java | 3 +- .../flexible/standard/TestQPHelper.java | 3 +- .../flexible/standard/TestStandardQP.java | 3 +- .../simple/TestSimpleQueryParser.java | 3 +- .../surround/query/BooleanQueryTst.java | 3 +- .../surround/query/ExceptionQueryTst.java | 3 +- .../surround/query/SingleFieldTestDb.java | 3 +- .../surround/query/SrndQueryTest.java | 3 +- .../surround/query/Test01Exceptions.java | 3 +- .../surround/query/Test02Boolean.java | 3 +- .../surround/query/Test03Distance.java | 3 +- .../queryparser/util/QueryParserTestBase.java | 3 +- .../queryparser/xml/TestCoreParser.java | 9 +- .../xml/TestCorePlusExtensionsParser.java | 9 +- .../xml/TestCorePlusQueriesParser.java | 9 +- .../xml/TestQueryTemplateManager.java | 3 +- .../TestNumericRangeQueryBuilder.java | 3 +- .../IndexAndTaxonomyReplicationHandler.java | 3 +- .../replicator/IndexAndTaxonomyRevision.java | 3 +- .../replicator/IndexInputInputStream.java | 3 +- .../replicator/IndexReplicationHandler.java | 3 +- .../lucene/replicator/IndexRevision.java | 3 +- .../lucene/replicator/LocalReplicator.java | 3 +- .../PerSessionDirectoryFactory.java | 3 +- .../lucene/replicator/ReplicationClient.java | 3 +- .../apache/lucene/replicator/Replicator.java | 3 +- .../apache/lucene/replicator/Revision.java | 3 +- .../lucene/replicator/RevisionFile.java | 3 +- .../replicator/SessionExpiredException.java | 3 +- .../lucene/replicator/SessionToken.java | 3 +- .../replicator/http/HttpClientBase.java | 3 +- .../replicator/http/HttpReplicator.java | 3 +- .../replicator/http/ReplicationService.java | 3 +- .../lucene/replicator/http/package-info.java | 1 - .../lucene/replicator/package-info.java | 1 - ...IndexAndTaxonomyReplicationClientTest.java | 3 +- .../IndexAndTaxonomyRevisionTest.java | 3 +- .../IndexReplicationClientTest.java | 3 +- .../lucene/replicator/IndexRevisionTest.java | 3 +- .../replicator/LocalReplicatorTest.java | 3 +- .../lucene/replicator/ReplicatorTestCase.java | 3 +- .../lucene/replicator/SessionTokenTest.java | 3 +- .../replicator/http/HttpReplicatorTest.java | 3 +- .../replicator/http/ReplicationServlet.java | 3 +- .../idversion/IDVersionPostingsFormat.java | 3 +- .../idversion/IDVersionPostingsReader.java | 3 +- .../idversion/IDVersionPostingsWriter.java | 3 +- .../idversion/IDVersionSegmentTermsEnum.java | 3 +- .../IDVersionSegmentTermsEnumFrame.java | 3 +- .../codecs/idversion/IDVersionTermState.java | 3 +- .../codecs/idversion/SingleDocsEnum.java | 3 +- .../codecs/idversion/SinglePostingsEnum.java | 3 +- .../VersionBlockTreeTermsReader.java | 3 +- .../VersionBlockTreeTermsWriter.java | 3 +- .../codecs/idversion/VersionFieldReader.java | 3 +- .../lucene/codecs/idversion/package-info.java | 1 - .../apache/lucene/document/GeoPointField.java | 3 +- .../apache/lucene/document/LatLonPoint.java | 3 +- .../lucene/payloads/PayloadSpanCollector.java | 3 +- .../lucene/payloads/PayloadSpanUtil.java | 3 +- .../apache/lucene/payloads/package-info.java | 1 - .../sandbox/queries/FuzzyLikeThisQuery.java | 3 +- .../sandbox/queries/SlowFuzzyQuery.java | 3 +- .../sandbox/queries/SlowFuzzyTermsEnum.java | 3 +- .../lucene/sandbox/queries/package-info.java | 1 - .../lucene/search/DocValuesNumbersQuery.java | 3 +- .../lucene/search/DocValuesRangeQuery.java | 3 +- .../lucene/search/DocValuesTermsQuery.java | 3 +- .../apache/lucene/search/GeoBoundingBox.java | 3 +- .../lucene/search/GeoPointDistanceQuery.java | 3 +- .../search/GeoPointDistanceQueryImpl.java | 3 +- .../search/GeoPointDistanceRangeQuery.java | 3 +- .../lucene/search/GeoPointInBBoxQuery.java | 3 +- .../search/GeoPointInBBoxQueryImpl.java | 3 +- .../lucene/search/GeoPointInPolygonQuery.java | 3 +- .../lucene/search/GeoPointTermQuery.java | 3 +- ...GeoPointTermQueryConstantScoreWrapper.java | 3 +- .../lucene/search/GeoPointTermsEnum.java | 3 +- .../lucene/search/PointInPolygonQuery.java | 3 +- .../lucene/search/PointInRectQuery.java | 3 +- .../lucene/search/TermAutomatonQuery.java | 3 +- .../lucene/search/TermAutomatonScorer.java | 3 +- .../TokenStreamToTermAutomatonQuery.java | 3 +- .../apache/lucene/util/GeoDistanceUtils.java | 3 +- .../org/apache/lucene/util/GeoHashUtils.java | 3 +- .../lucene/util/GeoProjectionUtils.java | 3 +- .../java/org/apache/lucene/util/GeoRect.java | 3 +- .../apache/lucene/util/GeoRelationUtils.java | 3 +- .../java/org/apache/lucene/util/GeoUtils.java | 3 +- .../idversion/StringAndPayloadField.java | 3 +- .../TestIDVersionPostingsFormat.java | 3 +- .../lucene/payloads/TestPayloadSpanUtil.java | 3 +- .../queries/FuzzyLikeThisQueryTest.java | 3 +- .../sandbox/queries/TestSlowFuzzyQuery.java | 3 +- .../sandbox/queries/TestSlowFuzzyQuery2.java | 3 +- .../search/TestDocValuesNumbersQuery.java | 3 +- .../search/TestDocValuesRangeQuery.java | 3 +- .../search/TestDocValuesTermsQuery.java | 3 +- .../search/TestFieldCacheTermsFilter.java | 3 +- .../lucene/search/TestGeoPointQuery.java | 3 +- .../lucene/search/TestLatLonPointQueries.java | 3 +- .../lucene/search/TestTermAutomatonQuery.java | 3 +- .../lucene/util/BaseGeoPointTestCase.java | 3 +- .../org/apache/lucene/util/TestGeoUtils.java | 3 +- .../lucene/spatial/SpatialStrategy.java | 3 +- .../bbox/BBoxSimilarityValueSource.java | 3 +- .../lucene/spatial/bbox/BBoxStrategy.java | 3 +- .../lucene/spatial/bbox/BBoxValueSource.java | 3 +- .../lucene/spatial/bbox/package-info.java | 1 - .../composite/CompositeSpatialStrategy.java | 3 +- .../composite/CompositeVerifyQuery.java | 3 +- .../composite/IntersectsRPTVerifyQuery.java | 3 +- .../spatial/composite/package-info.java | 1 - .../apache/lucene/spatial/package-info.java | 1 - .../prefix/AbstractPrefixTreeQuery.java | 3 +- .../AbstractVisitingPrefixTreeQuery.java | 3 +- .../prefix/BytesRefIteratorTokenStream.java | 3 +- .../prefix/CellToBytesRefIterator.java | 3 +- .../prefix/ContainsPrefixTreeQuery.java | 3 +- .../spatial/prefix/HeatmapFacetCounter.java | 3 +- .../prefix/IntersectsPrefixTreeQuery.java | 3 +- .../prefix/NumberRangePrefixTreeStrategy.java | 3 +- .../PointPrefixTreeFieldCacheProvider.java | 3 +- .../prefix/PrefixTreeFacetCounter.java | 3 +- .../spatial/prefix/PrefixTreeStrategy.java | 3 +- .../prefix/RecursivePrefixTreeStrategy.java | 3 +- .../prefix/TermQueryPrefixTreeStrategy.java | 3 +- .../spatial/prefix/WithinPrefixTreeQuery.java | 3 +- .../lucene/spatial/prefix/package-info.java | 1 - .../lucene/spatial/prefix/tree/Cell.java | 3 +- .../spatial/prefix/tree/CellIterator.java | 3 +- .../prefix/tree/DateRangePrefixTree.java | 3 +- .../prefix/tree/FilterCellIterator.java | 3 +- .../prefix/tree/GeohashPrefixTree.java | 3 +- .../spatial/prefix/tree/LegacyCell.java | 3 +- .../spatial/prefix/tree/LegacyPrefixTree.java | 3 +- .../prefix/tree/NumberRangePrefixTree.java | 3 +- .../prefix/tree/PackedQuadPrefixTree.java | 3 +- .../spatial/prefix/tree/QuadPrefixTree.java | 3 +- .../prefix/tree/SingletonCellIterator.java | 3 +- .../prefix/tree/SpatialPrefixTree.java | 3 +- .../prefix/tree/SpatialPrefixTreeFactory.java | 1 - .../spatial/prefix/tree/TreeCellIterator.java | 3 +- .../spatial/prefix/tree/package-info.java | 1 - .../lucene/spatial/query/SpatialArgs.java | 3 +- .../spatial/query/SpatialArgsParser.java | 3 +- .../spatial/query/SpatialOperation.java | 3 +- .../query/UnsupportedSpatialOperation.java | 3 +- .../lucene/spatial/query/package-info.java | 1 - .../serialized/SerializedDVStrategy.java | 3 +- .../spatial/serialized/package-info.java | 1 - .../lucene/spatial/spatial4j/Geo3dShape.java | 3 +- .../spatial/spatial4j/package-info.java | 1 - .../util/CachingDoubleValueSource.java | 1 - .../util/DistanceToShapeValueSource.java | 3 +- .../spatial/util/ShapeAreaValueSource.java | 3 +- .../lucene/spatial/util/ShapeFieldCache.java | 1 - .../ShapeFieldCacheDistanceValueSource.java | 3 +- .../spatial/util/ShapeFieldCacheProvider.java | 1 - .../util/ShapePredicateValueSource.java | 3 +- .../lucene/spatial/util/package-info.java | 1 - .../spatial/vector/DistanceValueSource.java | 3 +- .../spatial/vector/PointVectorStrategy.java | 3 +- .../lucene/spatial/vector/package-info.java | 1 - .../lucene/spatial/DistanceStrategyTest.java | 3 +- .../lucene/spatial/PortedSolr3Test.java | 3 +- .../spatial/QueryEqualsHashCodeTest.java | 3 +- .../lucene/spatial/SpatialArgsTest.java | 3 +- .../apache/lucene/spatial/SpatialExample.java | 3 +- .../lucene/spatial/SpatialMatchConcern.java | 1 - .../lucene/spatial/SpatialTestCase.java | 3 +- .../lucene/spatial/SpatialTestData.java | 3 +- .../lucene/spatial/SpatialTestQuery.java | 3 +- .../lucene/spatial/StrategyTestCase.java | 5 +- .../lucene/spatial/TestTestFramework.java | 3 +- .../lucene/spatial/bbox/TestBBoxStrategy.java | 3 +- .../composite/CompositeStrategyTest.java | 3 +- .../prefix/CellToBytesRefIterator50.java | 3 +- .../spatial/prefix/DateNRStrategyTest.java | 3 +- .../prefix/HeatmapFacetCounterTest.java | 3 +- .../lucene/spatial/prefix/JtsPolygonTest.java | 3 +- .../spatial/prefix/NumberRangeFacetsTest.java | 3 +- .../RandomSpatialOpFuzzyPrefixTree50Test.java | 3 +- .../RandomSpatialOpFuzzyPrefixTreeTest.java | 3 +- .../RandomSpatialOpStrategyTestCase.java | 3 +- .../TestRecursivePrefixTreeStrategy.java | 3 +- .../TestTermQueryPrefixGridStrategy.java | 3 +- .../prefix/tree/DateRangePrefixTreeTest.java | 3 +- .../prefix/tree/SpatialPrefixTreeTest.java | 3 +- .../spatial/query/SpatialArgsParserTest.java | 3 +- .../serialized/SerializedStrategyTest.java | 3 +- .../spatial/spatial4j/Geo3dRptTest.java | 3 +- .../Geo3dShapeRectRelationTestCase.java | 3 +- ...Geo3dShapeSphereModelRectRelationTest.java | 3 +- .../Geo3dShapeWGS84ModelRectRelationTest.java | 3 +- .../spatial4j/RandomizedShapeTestCase.java | 4 +- .../spatial/spatial4j/geo3d/GeoPointTest.java | 3 +- .../vector/TestPointVectorStrategy.java | 3 +- .../org/apache/lucene/geo3d/ArcDistance.java | 3 +- .../apache/lucene/geo3d/BasePlanetObject.java | 3 +- .../org/apache/lucene/geo3d/BaseXYZSolid.java | 3 +- .../java/org/apache/lucene/geo3d/Bounds.java | 3 +- .../apache/lucene/geo3d/DistanceStyle.java | 3 +- .../org/apache/lucene/geo3d/Geo3DPoint.java | 3 +- .../org/apache/lucene/geo3d/Geo3DUtil.java | 3 +- .../java/org/apache/lucene/geo3d/GeoArea.java | 3 +- .../apache/lucene/geo3d/GeoAreaFactory.java | 3 +- .../java/org/apache/lucene/geo3d/GeoBBox.java | 3 +- .../apache/lucene/geo3d/GeoBBoxFactory.java | 3 +- .../org/apache/lucene/geo3d/GeoBaseBBox.java | 3 +- .../apache/lucene/geo3d/GeoBaseCircle.java | 3 +- .../lucene/geo3d/GeoBaseDistanceShape.java | 3 +- .../lucene/geo3d/GeoBaseMembershipShape.java | 3 +- .../apache/lucene/geo3d/GeoBasePolygon.java | 3 +- .../org/apache/lucene/geo3d/GeoBaseShape.java | 3 +- .../org/apache/lucene/geo3d/GeoCircle.java | 3 +- .../apache/lucene/geo3d/GeoCircleFactory.java | 3 +- .../geo3d/GeoCompositeMembershipShape.java | 3 +- .../lucene/geo3d/GeoCompositePolygon.java | 3 +- .../apache/lucene/geo3d/GeoConvexPolygon.java | 3 +- .../geo3d/GeoDegenerateHorizontalLine.java | 3 +- .../geo3d/GeoDegenerateLatitudeZone.java | 3 +- .../geo3d/GeoDegenerateLongitudeSlice.java | 3 +- .../lucene/geo3d/GeoDegeneratePoint.java | 5 +- .../geo3d/GeoDegenerateVerticalLine.java | 3 +- .../org/apache/lucene/geo3d/GeoDistance.java | 3 +- .../apache/lucene/geo3d/GeoDistanceShape.java | 3 +- .../apache/lucene/geo3d/GeoLatitudeZone.java | 3 +- .../lucene/geo3d/GeoLongitudeSlice.java | 3 +- .../lucene/geo3d/GeoMembershipShape.java | 3 +- .../lucene/geo3d/GeoNorthLatitudeZone.java | 3 +- .../lucene/geo3d/GeoNorthRectangle.java | 3 +- .../lucene/geo3d/GeoOutsideDistance.java | 3 +- .../java/org/apache/lucene/geo3d/GeoPath.java | 3 +- .../org/apache/lucene/geo3d/GeoPoint.java | 5 +- .../org/apache/lucene/geo3d/GeoPolygon.java | 3 +- .../lucene/geo3d/GeoPolygonFactory.java | 3 +- .../org/apache/lucene/geo3d/GeoRectangle.java | 3 +- .../org/apache/lucene/geo3d/GeoShape.java | 3 +- .../org/apache/lucene/geo3d/GeoSizeable.java | 3 +- .../lucene/geo3d/GeoSouthLatitudeZone.java | 3 +- .../lucene/geo3d/GeoSouthRectangle.java | 3 +- .../lucene/geo3d/GeoStandardCircle.java | 3 +- .../GeoWideDegenerateHorizontalLine.java | 3 +- .../lucene/geo3d/GeoWideLongitudeSlice.java | 3 +- .../lucene/geo3d/GeoWideNorthRectangle.java | 3 +- .../apache/lucene/geo3d/GeoWideRectangle.java | 3 +- .../lucene/geo3d/GeoWideSouthRectangle.java | 3 +- .../org/apache/lucene/geo3d/GeoWorld.java | 3 +- .../org/apache/lucene/geo3d/LatLonBounds.java | 3 +- .../apache/lucene/geo3d/LinearDistance.java | 3 +- .../lucene/geo3d/LinearSquaredDistance.java | 3 +- .../org/apache/lucene/geo3d/Membership.java | 3 +- .../apache/lucene/geo3d/NormalDistance.java | 3 +- .../lucene/geo3d/NormalSquaredDistance.java | 3 +- .../java/org/apache/lucene/geo3d/Plane.java | 3 +- .../org/apache/lucene/geo3d/PlanetModel.java | 3 +- .../lucene/geo3d/PointInGeo3DShapeQuery.java | 3 +- .../org/apache/lucene/geo3d/SidedPlane.java | 3 +- .../apache/lucene/geo3d/StandardXYZSolid.java | 3 +- .../java/org/apache/lucene/geo3d/Tools.java | 3 +- .../java/org/apache/lucene/geo3d/Vector.java | 3 +- .../org/apache/lucene/geo3d/XYZBounds.java | 3 +- .../org/apache/lucene/geo3d/XYZSolid.java | 3 +- .../apache/lucene/geo3d/XYZSolidFactory.java | 3 +- .../org/apache/lucene/geo3d/XYdZSolid.java | 3 +- .../org/apache/lucene/geo3d/XdYZSolid.java | 3 +- .../org/apache/lucene/geo3d/XdYdZSolid.java | 3 +- .../org/apache/lucene/geo3d/dXYZSolid.java | 3 +- .../org/apache/lucene/geo3d/dXYdZSolid.java | 3 +- .../org/apache/lucene/geo3d/dXdYZSolid.java | 3 +- .../org/apache/lucene/geo3d/dXdYdZSolid.java | 3 +- .../org/apache/lucene/geo3d/package-info.java | 1 - .../org/apache/lucene/geo3d/GeoBBoxTest.java | 3 +- .../apache/lucene/geo3d/GeoCircleTest.java | 3 +- .../lucene/geo3d/GeoConvexPolygonTest.java | 3 +- .../org/apache/lucene/geo3d/GeoModelTest.java | 3 +- .../org/apache/lucene/geo3d/GeoPathTest.java | 3 +- .../apache/lucene/geo3d/GeoPolygonTest.java | 3 +- .../org/apache/lucene/geo3d/PlaneTest.java | 3 +- .../apache/lucene/geo3d/TestGeo3DPoint.java | 3 +- .../org/apache/lucene/geo3d/XYZSolidTest.java | 3 +- .../search/spell/CombineSuggestion.java | 3 +- .../lucene/search/spell/Dictionary.java | 3 +- .../search/spell/DirectSpellChecker.java | 3 +- .../search/spell/HighFrequencyDictionary.java | 1 - .../search/spell/JaroWinklerDistance.java | 3 +- .../search/spell/LevensteinDistance.java | 3 +- .../lucene/search/spell/LuceneDictionary.java | 3 +- .../spell/LuceneLevenshteinDistance.java | 3 +- .../lucene/search/spell/NGramDistance.java | 33 ++++--- .../search/spell/PlainTextDictionary.java | 3 +- .../lucene/search/spell/SpellChecker.java | 3 +- .../lucene/search/spell/StringDistance.java | 3 +- .../lucene/search/spell/SuggestMode.java | 3 +- .../lucene/search/spell/SuggestWord.java | 5 +- .../spell/SuggestWordFrequencyComparator.java | 6 +- .../lucene/search/spell/SuggestWordQueue.java | 5 +- .../spell/SuggestWordScoreComparator.java | 3 +- .../search/spell/WordBreakSpellChecker.java | 3 +- .../lucene/search/spell/package-info.java | 2 - .../lucene/search/suggest/BitsProducer.java | 3 +- .../search/suggest/BufferedInputIterator.java | 3 +- .../search/suggest/DocumentDictionary.java | 3 +- .../DocumentValueSourceDictionary.java | 3 +- .../lucene/search/suggest/FileDictionary.java | 4 +- .../lucene/search/suggest/InMemorySorter.java | 3 +- .../lucene/search/suggest/InputIterator.java | 3 +- .../apache/lucene/search/suggest/Lookup.java | 3 +- .../search/suggest/SortedInputIterator.java | 3 +- .../search/suggest/UnsortedInputIterator.java | 3 +- .../analyzing/AnalyzingInfixSuggester.java | 3 +- .../suggest/analyzing/AnalyzingSuggester.java | 3 +- .../analyzing/BlendedInfixSuggester.java | 3 +- .../search/suggest/analyzing/FSTUtil.java | 3 +- .../suggest/analyzing/FreeTextSuggester.java | 3 +- .../suggest/analyzing/FuzzySuggester.java | 3 +- .../suggest/analyzing/SuggestStopFilter.java | 3 +- .../analyzing/SuggestStopFilterFactory.java | 3 +- .../suggest/analyzing/package-info.java | 1 - .../document/Completion50PostingsFormat.java | 4 +- .../suggest/document/CompletionAnalyzer.java | 3 +- .../document/CompletionFieldsConsumer.java | 3 +- .../document/CompletionFieldsProducer.java | 3 +- .../document/CompletionPostingsFormat.java | 3 +- .../suggest/document/CompletionQuery.java | 3 +- .../suggest/document/CompletionScorer.java | 3 +- .../suggest/document/CompletionTerms.java | 3 +- .../document/CompletionTokenStream.java | 3 +- .../suggest/document/CompletionWeight.java | 3 +- .../document/CompletionsTermsReader.java | 3 +- .../search/suggest/document/ContextQuery.java | 3 +- .../suggest/document/ContextSuggestField.java | 3 +- .../document/FuzzyCompletionQuery.java | 3 +- .../search/suggest/document/NRTSuggester.java | 3 +- .../suggest/document/NRTSuggesterBuilder.java | 3 +- .../document/PrefixCompletionQuery.java | 3 +- .../document/RegexCompletionQuery.java | 3 +- .../search/suggest/document/SuggestField.java | 3 +- .../document/SuggestIndexSearcher.java | 3 +- .../SuggestScoreDocPriorityQueue.java | 3 +- .../suggest/document/TopSuggestDocs.java | 3 +- .../document/TopSuggestDocsCollector.java | 3 +- .../search/suggest/document/package-info.java | 1 - .../search/suggest/fst/BytesRefSorter.java | 3 +- .../search/suggest/fst/ExternalRefSorter.java | 3 +- .../search/suggest/fst/FSTCompletion.java | 3 +- .../suggest/fst/FSTCompletionBuilder.java | 3 +- .../suggest/fst/FSTCompletionLookup.java | 3 +- .../suggest/fst/WFSTCompletionLookup.java | 3 +- .../search/suggest/fst/package-info.java | 1 - .../search/suggest/jaspell/JaspellLookup.java | 3 +- .../jaspell/JaspellTernarySearchTrie.java | 3 +- .../search/suggest/jaspell/package-info.java | 1 - .../lucene/search/suggest/package-info.java | 1 - .../search/suggest/tst/TSTAutocomplete.java | 3 +- .../lucene/search/suggest/tst/TSTLookup.java | 3 +- .../search/suggest/tst/TernaryTreeNode.java | 7 +- .../search/suggest/tst/package-info.java | 1 - .../search/spell/TestDirectSpellChecker.java | 3 +- .../search/spell/TestJaroWinklerDistance.java | 3 +- .../search/spell/TestLevenshteinDistance.java | 3 +- .../search/spell/TestLuceneDictionary.java | 3 +- .../search/spell/TestNGramDistance.java | 3 +- .../search/spell/TestPlainTextDictionary.java | 3 +- .../lucene/search/spell/TestSpellChecker.java | 3 +- .../spell/TestWordBreakSpellChecker.java | 3 +- .../apache/lucene/search/suggest/Average.java | 5 +- .../suggest/DocumentDictionaryTest.java | 33 ++++--- .../DocumentValueSourceDictionaryTest.java | 3 +- .../search/suggest/FileDictionaryTest.java | 33 ++++--- .../apache/lucene/search/suggest/Input.java | 3 +- .../search/suggest/InputArrayIterator.java | 3 +- .../search/suggest/LookupBenchmarkTest.java | 3 +- .../suggest/TestHighFrequencyDictionary.java | 27 +++--- .../search/suggest/TestInputIterator.java | 27 +++--- .../AnalyzingInfixSuggesterTest.java | 3 +- .../analyzing/AnalyzingSuggesterTest.java | 3 +- .../analyzing/BlendedInfixSuggesterTest.java | 3 +- .../suggest/analyzing/FuzzySuggesterTest.java | 3 +- .../analyzing/TestFreeTextSuggester.java | 3 +- .../analyzing/TestSuggestStopFilter.java | 3 +- .../TestSuggestStopFilterFactory.java | 3 +- .../document/CompletionTokenStreamTest.java | 3 +- .../suggest/document/TestContextQuery.java | 3 +- .../document/TestContextSuggestField.java | 3 +- .../document/TestFuzzyCompletionQuery.java | 3 +- .../document/TestPrefixCompletionQuery.java | 3 +- .../document/TestRegexCompletionQuery.java | 3 +- .../suggest/document/TestSuggestField.java | 3 +- .../suggest/fst/BytesRefSortersTest.java | 3 +- .../search/suggest/fst/FSTCompletionTest.java | 3 +- .../suggest/fst/WFSTCompletionTest.java | 3 +- .../analysis/BaseTokenStreamTestCase.java | 3 +- .../analysis/CannedBinaryTokenStream.java | 3 +- .../lucene/analysis/CannedTokenStream.java | 3 +- .../lucene/analysis/CollationTestBase.java | 4 +- .../lucene/analysis/CrankyTokenFilter.java | 3 +- .../lucene/analysis/LookaheadTokenFilter.java | 3 +- .../apache/lucene/analysis/MockAnalyzer.java | 3 +- .../lucene/analysis/MockBytesAnalyzer.java | 3 +- .../lucene/analysis/MockCharFilter.java | 3 +- .../MockFixedLengthPayloadFilter.java | 3 +- .../lucene/analysis/MockGraphTokenFilter.java | 3 +- .../MockHoleInjectingTokenFilter.java | 4 +- .../lucene/analysis/MockPayloadAnalyzer.java | 4 +- .../MockRandomLookaheadTokenFilter.java | 3 +- .../lucene/analysis/MockReaderWrapper.java | 3 +- .../lucene/analysis/MockTokenFilter.java | 3 +- .../apache/lucene/analysis/MockTokenizer.java | 3 +- .../analysis/MockUTF16TermAttributeImpl.java | 3 +- .../MockVariableLengthPayloadFilter.java | 3 +- .../lucene/analysis/SimplePayloadFilter.java | 3 +- .../lucene/analysis/TokenStreamToDot.java | 3 +- .../analysis/ValidatingTokenFilter.java | 3 +- .../lucene/analysis/VocabularyAssert.java | 3 +- .../lucene/codecs/MissingOrdRemapper.java | 11 ++- .../codecs/asserting/AssertingCodec.java | 3 +- .../asserting/AssertingDocValuesFormat.java | 3 +- .../asserting/AssertingLiveDocsFormat.java | 3 +- .../asserting/AssertingNormsFormat.java | 3 +- .../asserting/AssertingPointFormat.java | 3 +- .../asserting/AssertingPostingsFormat.java | 3 +- .../AssertingStoredFieldsFormat.java | 3 +- .../asserting/AssertingTermVectorsFormat.java | 3 +- .../lucene/codecs/asserting/package-info.java | 1 - .../codecs/blockterms/LuceneFixedGap.java | 3 +- .../LuceneVarGapDocFreqInterval.java | 3 +- .../blockterms/LuceneVarGapFixedInterval.java | 3 +- .../TestBloomFilteredLucenePostings.java | 3 +- .../cheapbastard/CheapBastardCodec.java | 3 +- .../codecs/cheapbastard/package-info.java | 1 - .../codecs/compressing/CompressingCodec.java | 3 +- .../compressing/FastCompressingCodec.java | 3 +- .../FastDecompressionCompressingCodec.java | 3 +- .../HighCompressionCompressingCodec.java | 3 +- .../dummy/DummyCompressingCodec.java | 3 +- .../compressing/dummy/package-info.java | 1 - .../lucene/codecs/cranky/CrankyCodec.java | 3 +- .../codecs/cranky/CrankyCompoundFormat.java | 3 +- .../codecs/cranky/CrankyDocValuesFormat.java | 3 +- .../codecs/cranky/CrankyFieldInfosFormat.java | 3 +- .../codecs/cranky/CrankyLiveDocsFormat.java | 3 +- .../codecs/cranky/CrankyNormsFormat.java | 3 +- .../codecs/cranky/CrankyPointFormat.java | 3 +- .../codecs/cranky/CrankyPostingsFormat.java | 3 +- .../cranky/CrankySegmentInfoFormat.java | 3 +- .../cranky/CrankyStoredFieldsFormat.java | 3 +- .../cranky/CrankyTermVectorsFormat.java | 3 +- .../lucene/codecs/cranky/package-info.java | 1 - .../mockrandom/MockRandomPostingsFormat.java | 3 +- .../codecs/mockrandom/package-info.java | 1 - .../codecs/ramonly/RAMOnlyPostingsFormat.java | 3 +- .../lucene/codecs/ramonly/package-info.java | 1 - .../lucene/index/AlcoholicMergePolicy.java | 3 +- .../lucene/index/AllDeletedFilterReader.java | 7 +- .../index/AssertingDirectoryReader.java | 3 +- .../lucene/index/AssertingLeafReader.java | 21 +++-- .../index/BaseCompoundFormatTestCase.java | 3 +- ...aseCompressingDocValuesFormatTestCase.java | 3 +- .../index/BaseDocValuesFormatTestCase.java | 3 +- .../index/BaseFieldInfoFormatTestCase.java | 3 +- .../index/BaseIndexFileFormatTestCase.java | 3 +- .../lucene/index/BaseMergePolicyTestCase.java | 3 +- .../lucene/index/BaseNormsFormatTestCase.java | 3 +- .../lucene/index/BasePointFormatTestCase.java | 3 +- .../index/BasePostingsFormatTestCase.java | 3 +- .../index/BaseSegmentInfoFormatTestCase.java | 3 +- .../index/BaseStoredFieldsFormatTestCase.java | 3 +- .../index/BaseTermVectorsFormatTestCase.java | 3 +- .../lucene/index/BaseTestCheckIndex.java | 4 +- .../org/apache/lucene/index/DocHelper.java | 3 +- .../lucene/index/FieldFilterLeafReader.java | 3 +- .../apache/lucene/index/ForceMergePolicy.java | 3 +- .../index/IndexWriterMaxDocsChanger.java | 7 +- .../index/MismatchedDirectoryReader.java | 3 +- .../lucene/index/MismatchedLeafReader.java | 3 +- .../lucene/index/MockRandomMergePolicy.java | 3 +- .../lucene/index/PerThreadPKLookup.java | 3 +- .../org/apache/lucene/index/RandomCodec.java | 3 +- .../lucene/index/RandomIndexWriter.java | 3 +- .../lucene/index/RandomPostingsTester.java | 3 +- .../SuppressingConcurrentMergeScheduler.java | 7 +- .../ThreadedIndexingAndSearchingTestCase.java | 3 +- .../lucene/mockfile/DisableFsyncFS.java | 23 +++-- .../org/apache/lucene/mockfile/ExtrasFS.java | 3 +- .../FilterAsynchronousFileChannel.java | 3 +- .../mockfile/FilterDirectoryStream.java | 3 +- .../lucene/mockfile/FilterFileChannel.java | 3 +- .../lucene/mockfile/FilterFileStore.java | 3 +- .../lucene/mockfile/FilterFileSystem.java | 3 +- .../mockfile/FilterFileSystemProvider.java | 3 +- .../lucene/mockfile/FilterInputStream2.java | 3 +- .../lucene/mockfile/FilterOutputStream2.java | 3 +- .../apache/lucene/mockfile/FilterPath.java | 3 +- .../mockfile/FilterSeekableByteChannel.java | 3 +- .../apache/lucene/mockfile/HandleLimitFS.java | 3 +- .../lucene/mockfile/HandleTrackingFS.java | 3 +- .../org/apache/lucene/mockfile/LeakFS.java | 3 +- .../mockfile/MockFileSystemTestCase.java | 3 +- .../org/apache/lucene/mockfile/ShuffleFS.java | 3 +- .../org/apache/lucene/mockfile/VerboseFS.java | 3 +- .../org/apache/lucene/mockfile/WindowsFS.java | 3 +- .../apache/lucene/mockfile/package-info.java | 1 - .../lucene/search/AssertingBulkScorer.java | 3 +- .../lucene/search/AssertingCollector.java | 3 +- .../lucene/search/AssertingIndexSearcher.java | 3 +- .../lucene/search/AssertingLeafCollector.java | 3 +- .../apache/lucene/search/AssertingQuery.java | 3 +- .../apache/lucene/search/AssertingScorer.java | 3 +- .../apache/lucene/search/AssertingWeight.java | 3 +- .../search/BaseExplanationTestCase.java | 3 +- .../search/BulkScorerWrapperScorer.java | 3 +- .../org/apache/lucene/search/CheckHits.java | 3 +- .../org/apache/lucene/search/QueryUtils.java | 3 +- .../search/RandomApproximationQuery.java | 3 +- .../lucene/search/ScorerIndexSearcher.java | 3 +- .../search/SearchEquivalenceTestBase.java | 3 +- .../lucene/search/ShardSearchingTestBase.java | 3 +- .../search/similarities/RandomSimilarity.java | 3 +- .../search/spans/AssertingSpanQuery.java | 3 +- .../search/spans/AssertingSpanWeight.java | 3 +- .../lucene/search/spans/AssertingSpans.java | 3 +- .../search/spans/MultiSpansWrapper.java | 3 +- .../lucene/search/spans/SpanTestUtil.java | 3 +- .../lucene/store/BaseDirectoryTestCase.java | 3 +- .../lucene/store/BaseDirectoryWrapper.java | 3 +- .../lucene/store/BaseLockFactoryTestCase.java | 3 +- .../lucene/store/MockDirectoryWrapper.java | 3 +- .../lucene/store/MockIndexInputWrapper.java | 13 ++- .../lucene/store/MockIndexOutputWrapper.java | 3 +- .../lucene/store/RawDirectoryWrapper.java | 3 +- .../SlowClosingMockIndexInputWrapper.java | 3 +- .../SlowOpeningMockIndexInputWrapper.java | 3 +- .../lucene/util/AbstractBeforeAfterRule.java | 23 +++-- .../lucene/util/BaseBitSetTestCase.java | 3 +- .../lucene/util/BaseDocIdSetTestCase.java | 3 +- .../lucene/util/CloseableDirectory.java | 15 ++-- .../java/org/apache/lucene/util/English.java | 9 +- .../util/FailOnNonBulkMergesInfoStream.java | 3 +- .../org/apache/lucene/util/FailureMarker.java | 13 ++- .../org/apache/lucene/util/LineFileDocs.java | 3 +- .../util/LuceneJUnit3MethodProvider.java | 3 +- .../apache/lucene/util/LuceneTestCase.java | 3 +- .../apache/lucene/util/NullInfoStream.java | 3 +- .../lucene/util/QuickPatchThreadsFilter.java | 7 +- .../apache/lucene/util/RamUsageTester.java | 3 +- .../apache/lucene/util/RemoveUponClose.java | 19 ++-- .../java/org/apache/lucene/util/Rethrow.java | 3 +- .../util/RunListenerPrintReproduceInfo.java | 33 ++++--- .../util/TestRuleAssertionsRequired.java | 3 +- .../apache/lucene/util/TestRuleDelegate.java | 15 ++-- .../util/TestRuleIgnoreAfterMaxFailures.java | 21 +++-- .../lucene/util/TestRuleIgnoreTestSuites.java | 11 ++- .../lucene/util/TestRuleLimitSysouts.java | 33 ++++--- .../lucene/util/TestRuleMarkFailure.java | 19 ++-- .../util/TestRuleRestoreSystemProperties.java | 17 ++-- .../util/TestRuleSetupAndRestoreClassEnv.java | 3 +- .../TestRuleSetupAndRestoreInstanceEnv.java | 7 +- .../util/TestRuleSetupTeardownChained.java | 13 ++- .../lucene/util/TestRuleStoreClassName.java | 3 +- .../util/TestRuleTemporaryFilesCleanup.java | 3 +- .../util/TestRuleThreadAndTestName.java | 11 ++- .../lucene/util/TestSecurityManager.java | 9 +- .../java/org/apache/lucene/util/TestUtil.java | 3 +- .../lucene/util/ThrottledIndexOutput.java | 9 +- .../org/apache/lucene/util/TimeUnits.java | 3 +- .../util/automaton/AutomatonTestUtil.java | 3 +- .../org/apache/lucene/util/fst/FSTTester.java | 9 +- .../lucene/analysis/TestGraphTokenizers.java | 3 +- .../analysis/TestLookaheadTokenFilter.java | 3 +- .../lucene/analysis/TestMockAnalyzer.java | 3 +- .../lucene/analysis/TestMockCharFilter.java | 9 +- .../apache/lucene/analysis/TestPosition.java | 5 +- .../analysis/TrivialLookaheadFilter.java | 3 +- .../TestAssertingDocValuesFormat.java | 3 +- .../asserting/TestAssertingNormsFormat.java | 3 +- .../asserting/TestAssertingPointFormat.java | 3 +- .../TestAssertingPostingsFormat.java | 3 +- .../TestAssertingStoredFieldsFormat.java | 3 +- .../TestAssertingTermVectorsFormat.java | 3 +- .../TestCompressingStoredFieldsFormat.java | 3 +- .../TestCompressingTermVectorsFormat.java | 33 ++++--- .../lucene/index/TestAssertingLeafReader.java | 3 +- .../lucene/index/TestForceMergePolicy.java | 3 +- .../lucene/mockfile/TestDisableFsyncFS.java | 3 +- .../apache/lucene/mockfile/TestExtrasFS.java | 3 +- .../lucene/mockfile/TestHandleLimitFS.java | 3 +- .../lucene/mockfile/TestHandleTrackingFS.java | 3 +- .../apache/lucene/mockfile/TestLeakFS.java | 3 +- .../apache/lucene/mockfile/TestShuffleFS.java | 3 +- .../apache/lucene/mockfile/TestVerboseFS.java | 3 +- .../apache/lucene/mockfile/TestWindowsFS.java | 3 +- .../store/TestMockDirectoryWrapper.java | 3 +- .../org/apache/lucene/util/SorePoint.java | 3 +- .../test/org/apache/lucene/util/SoreType.java | 3 +- .../lucene/util/TestBeforeAfterOverrides.java | 17 ++-- .../apache/lucene/util/TestCodecReported.java | 15 ++-- .../util/TestExceptionInBeforeClassHooks.java | 3 +- .../util/TestFailIfDirectoryNotClosed.java | 3 +- .../util/TestFailIfUnreferencedFiles.java | 3 +- .../lucene/util/TestGroupFiltering.java | 21 +++-- .../lucene/util/TestJUnitRuleOrder.java | 3 +- .../lucene/util/TestMaxFailuresRule.java | 3 +- .../util/TestRamUsageTesterOnWildAnimals.java | 3 +- .../lucene/util/TestReproduceMessage.java | 3 +- .../TestReproduceMessageWithRepeated.java | 3 +- .../TestRunWithRestrictedPermissions.java | 3 +- .../lucene/util/TestSeedFromUncaught.java | 3 +- .../util/TestSetupTeardownChaining.java | 3 +- .../util/TestWorstCaseTestBehavior.java | 15 ++-- .../apache/lucene/util/WithNestedTests.java | 3 +- .../GetMavenDependenciesTask.java | 3 +- .../dependencies/InterpolatedProperties.java | 3 +- .../validation/LibVersionsCheckTask.java | 3 +- .../lucene/validation/LicenseCheckTask.java | 3 +- .../apache/lucene/validation/LicenseType.java | 5 +- .../validation/ivyde/IvyNodeElement.java | 28 +++--- .../ivyde/IvyNodeElementAdapter.java | 28 +++--- .../apache/solr/schema/ICUCollationField.java | 3 +- .../TestFoldingMultitermExtrasQuery.java | 3 +- .../solr/schema/TestICUCollationField.java | 1 - .../TestICUCollationFieldDocValues.java | 1 - .../schema/TestICUCollationFieldOptions.java | 3 +- .../accumulator/BasicAccumulator.java | 1 - .../accumulator/FacetingAccumulator.java | 1 - .../accumulator/ValueAccumulator.java | 1 - .../facet/FacetValueAccumulator.java | 1 - .../facet/FieldFacetAccumulator.java | 1 - .../facet/QueryFacetAccumulator.java | 1 - .../facet/RangeFacetAccumulator.java | 1 - .../accumulator/facet/package-info.java | 1 - .../analytics/accumulator/package-info.java | 1 - .../analytics/expression/BaseExpression.java | 1 - .../expression/DualDelegateExpression.java | 1 - .../solr/analytics/expression/Expression.java | 1 - .../expression/ExpressionFactory.java | 1 - .../expression/MultiDelegateExpression.java | 1 - .../expression/SingleDelegateExpression.java | 1 - .../analytics/expression/package-info.java | 1 - .../plugin/AnalyticsStatisticsCollector.java | 1 - .../solr/analytics/plugin/package-info.java | 1 - .../request/AbstractFieldFacetRequest.java | 1 - .../request/AnalyticsContentHandler.java | 1 - .../analytics/request/AnalyticsRequest.java | 1 - .../request/AnalyticsRequestFactory.java | 1 - .../analytics/request/AnalyticsStats.java | 1 - .../analytics/request/ExpressionRequest.java | 1 - .../solr/analytics/request/FacetRequest.java | 1 - .../analytics/request/FieldFacetRequest.java | 1 - .../analytics/request/QueryFacetRequest.java | 1 - .../analytics/request/RangeFacetRequest.java | 1 - .../solr/analytics/request/package-info.java | 1 - .../AbstractDelegatingStatsCollector.java | 1 - .../statistics/MedianStatsCollector.java | 1 - .../statistics/MinMaxStatsCollector.java | 1 - .../statistics/NumericStatsCollector.java | 1 - .../statistics/PercentileStatsCollector.java | 1 - .../analytics/statistics/StatsCollector.java | 1 - .../StatsCollectorSupplierFactory.java | 1 - .../statistics/UniqueStatsCollector.java | 1 - .../analytics/statistics/package-info.java | 1 - .../solr/analytics/util/AnalyticsParams.java | 1 - .../solr/analytics/util/AnalyticsParsers.java | 1 - .../solr/analytics/util/MedianCalculator.java | 1 - .../analytics/util/PercentileCalculator.java | 1 - .../util/RangeEndpointCalculator.java | 1 - .../solr/analytics/util/package-info.java | 1 - .../AbsoluteValueDoubleFunction.java | 1 - .../util/valuesource/AddDoubleFunction.java | 1 - .../valuesource/ConcatStringFunction.java | 1 - .../util/valuesource/ConstDateSource.java | 1 - .../util/valuesource/ConstDoubleSource.java | 1 - .../util/valuesource/ConstStringSource.java | 1 - .../util/valuesource/DateFieldSource.java | 1 - .../util/valuesource/DateMathFunction.java | 1 - .../util/valuesource/DivDoubleFunction.java | 1 - .../util/valuesource/DualDoubleFunction.java | 1 - .../util/valuesource/FilterFieldSource.java | 1 - .../util/valuesource/LogDoubleFunction.java | 1 - .../util/valuesource/MultiDateFunction.java | 1 - .../util/valuesource/MultiDoubleFunction.java | 1 - .../util/valuesource/MultiStringFunction.java | 1 - .../valuesource/MultiplyDoubleFunction.java | 1 - .../valuesource/NegateDoubleFunction.java | 1 - .../util/valuesource/PowDoubleFunction.java | 1 - .../valuesource/ReverseStringFunction.java | 1 - .../valuesource/SingleDoubleFunction.java | 1 - .../valuesource/SingleStringFunction.java | 1 - .../util/valuesource/package-info.java | 1 - .../handler/component/AnalyticsComponent.java | 1 - .../analytics/AbstractAnalyticsStatsTest.java | 1 - .../apache/solr/analytics/NoFacetTest.java | 1 - .../analytics/expression/ExpressionTest.java | 1 - .../facet/AbstractAnalyticsFacetTest.java | 1 - .../analytics/facet/FieldFacetExtrasTest.java | 1 - .../solr/analytics/facet/FieldFacetTest.java | 1 - .../solr/analytics/facet/QueryFacetTest.java | 1 - .../solr/analytics/facet/RangeFacetTest.java | 1 - .../util/valuesource/FunctionTest.java | 1 - .../clustering/ClusteringComponent.java | 3 +- .../handler/clustering/ClusteringEngine.java | 2 +- .../handler/clustering/ClusteringParams.java | 3 +- .../clustering/DocumentClusteringEngine.java | 3 +- .../clustering/SearchClusteringEngine.java | 3 +- .../carrot2/CarrotClusteringEngine.java | 3 +- .../clustering/carrot2/CarrotParams.java | 10 +-- .../carrot2/LuceneCarrot2StemmerFactory.java | 7 +- .../LuceneCarrot2TokenizerFactory.java | 3 +- .../carrot2/SolrResourceLocator.java | 1 - ...olrStopwordsCarrot2LexicalDataFactory.java | 3 +- .../clustering/carrot2/package-info.java | 1 - .../solr/handler/clustering/package-info.java | 1 - .../AbstractClusteringTestCase.java | 3 +- .../clustering/ClusteringComponentTest.java | 3 +- .../DistributedClusteringComponentTest.java | 3 +- .../MockDocumentClusteringEngine.java | 2 +- .../carrot2/CarrotClusteringEngineTest.java | 3 +- .../carrot2/DuplicatingStemmerFactory.java | 3 +- .../carrot2/DuplicatingTokenizerFactory.java | 3 +- .../carrot2/EchoClusteringAlgorithm.java | 2 +- .../carrot2/EchoStemsClusteringAlgorithm.java | 4 +- .../EchoTokensClusteringAlgorithm.java | 4 +- ...icalResourcesCheckClusteringAlgorithm.java | 4 +- .../carrot2/MockClusteringAlgorithm.java | 2 +- .../handler/dataimport/CachePropertyUtil.java | 3 +- .../solr/handler/dataimport/Context.java | 1 - .../solr/handler/dataimport/ContextImpl.java | 4 +- .../solr/handler/dataimport/DIHCache.java | 3 +- .../handler/dataimport/DIHCacheSupport.java | 3 +- .../solr/handler/dataimport/DIHLogLevels.java | 3 +- .../handler/dataimport/DIHProperties.java | 5 +- .../solr/handler/dataimport/DIHWriter.java | 2 +- .../handler/dataimport/DIHWriterBase.java | 3 +- .../DataImportHandlerException.java | 1 - .../solr/handler/dataimport/DataImporter.java | 1 - .../solr/handler/dataimport/DataSource.java | 1 - .../dataimport/DateFormatEvaluator.java | 33 ++++--- .../dataimport/DateFormatTransformer.java | 1 - .../solr/handler/dataimport/DebugLogger.java | 3 +- .../solr/handler/dataimport/DocBuilder.java | 1 - .../dataimport/NumberFormatTransformer.java | 3 +- .../dataimport/SimplePropertiesWriter.java | 3 +- .../dataimport/SolrEntityProcessor.java | 3 +- .../SolrQueryEscapingEvaluator.java | 15 ++-- .../dataimport/SortedMapBackedCache.java | 3 +- .../dataimport/SqlEscapingEvaluator.java | 11 ++- .../solr/handler/dataimport/UrlEvaluator.java | 17 ++-- .../solr/handler/dataimport/Zipper.java | 27 +++--- .../dataimport/config/DIHConfiguration.java | 33 ++++--- .../handler/dataimport/config/Entity.java | 26 +++--- .../dataimport/config/EntityField.java | 1 - .../solr/handler/dataimport/config/Field.java | 1 - .../dataimport/config/PropertyWriter.java | 9 +- .../handler/dataimport/config/Script.java | 25 +++--- .../dataimport/config/package-info.java | 1 - .../solr/handler/dataimport/package-info.java | 1 - .../dataimport/AbstractDIHCacheTestCase.java | 3 +- .../dataimport/AbstractDIHJdbcTestCase.java | 30 +++---- .../AbstractSqlEntityProcessorTestCase.java | 33 ++++--- .../dataimport/AddAColumnTransformer.java | 7 +- .../handler/dataimport/DestroyCountCache.java | 3 +- .../dataimport/MockSolrEntityProcessor.java | 3 +- .../dataimport/TestEphemeralCache.java | 3 +- .../handler/dataimport/TestErrorHandling.java | 3 +- .../TestFileListEntityProcessor.java | 3 +- .../TestFileListWithLineEntityProcessor.java | 19 ++-- .../TestHierarchicalDocBuilder.java | 3 +- .../TestJdbcDataSourceConvertType.java | 3 +- .../dataimport/TestLineEntityProcessor.java | 3 +- .../dataimport/TestNestedChildren.java | 15 ++-- .../TestSimplePropertiesWriter.java | 33 ++++--- .../TestSolrEntityProcessorEndToEnd.java | 3 +- .../TestSolrEntityProcessorUnit.java | 2 +- .../dataimport/TestSortedMapBackedCache.java | 7 +- .../dataimport/TestSqlEntityProcessor.java | 9 +- .../TestSqlEntityProcessorDelta.java | 21 +++-- .../TestVariableResolverEndToEnd.java | 31 ++++--- .../dataimport/TestXPathRecordReader.java | 2 +- .../dataimport/TestZKPropertiesWriter.java | 7 +- .../dataimport/TripleThreatTransformer.java | 16 ++-- .../extraction/ParseContextConfig.java | 3 +- .../RegexRulesPasswordProvider.java | 1 - .../extraction/SolrContentHandler.java | 1 - .../solr/handler/extraction/package-info.java | 1 - .../ExtractingRequestHandlerTest.java | 3 +- .../extraction/ParseContextConfigTest.java | 3 +- .../update/processor/DetectedLanguage.java | 3 +- ...tectLanguageIdentifierUpdateProcessor.java | 3 +- ...guageIdentifierUpdateProcessorFactory.java | 3 +- .../solr/update/processor/LangIdParams.java | 3 +- .../LanguageIdentifierUpdateProcessor.java | 3 +- ...TikaLanguageIdentifierUpdateProcessor.java | 3 +- ...guageIdentifierUpdateProcessorFactory.java | 3 +- ...eIdentifierUpdateProcessorFactoryTest.java | 3 +- ...ntifierUpdateProcessorFactoryTestCase.java | 1 - ...eIdentifierUpdateProcessorFactoryTest.java | 3 +- .../solr/hadoop/AlphaNumericComparator.java | 1 - .../solr/hadoop/DataInputInputStream.java | 1 - .../UnbufferedDataInputInputStream.java | 1 - .../solr/hadoop/ZooKeeperInspector.java | 1 - .../solr/hadoop/dedup/package-info.java | 1 - .../solr/hadoop/morphline/package-info.java | 1 - .../org/apache/solr/hadoop/package-info.java | 1 - .../hadoop/MorphlineGoLiveMiniMRTest.java | 1 - .../solr/morphlines/cell/package-info.java | 1 - .../solr/morphlines/solr/package-info.java | 1 - .../solr/AbstractSolrMorphlineZkTestBase.java | 1 - .../uima/processor/FieldMappingException.java | 3 +- .../uima/processor/SolrUIMAConfiguration.java | 3 +- .../SolrUIMAConfigurationReader.java | 3 +- .../solr/uima/processor/UIMAToSolrMapper.java | 3 +- .../processor/UIMAUpdateRequestProcessor.java | 3 +- .../UIMAUpdateRequestProcessorFactory.java | 3 +- .../solr/uima/processor/package-info.java | 1 - .../UIMATokenizersSolrIntegrationTest.java | 3 +- .../UIMAUpdateRequestProcessorTest.java | 3 +- .../processor/an/DummyEntityAnnotator.java | 17 ++-- .../processor/an/DummyExceptionAnnotator.java | 11 ++- .../processor/an/DummySentimentAnnotator.java | 21 +++-- .../org/apache/solr/response/PageTool.java | 1 - .../response/SolrParamResourceLoader.java | 1 - .../solr/response/SolrVelocityLogger.java | 3 +- .../solr/response/VelocityResponseWriter.java | 1 - .../org/apache/solr/velocity/MockTool.java | 3 +- .../velocity/VelocityResponseWriterTest.java | 1 - .../solr/analysis/ReversedWildcardFilter.java | 3 +- .../ReversedWildcardFilterFactory.java | 3 +- .../apache/solr/analysis/SolrAnalyzer.java | 1 - .../apache/solr/analysis/TokenizerChain.java | 1 - .../apache/solr/analysis/package-info.java | 1 - .../solrj/embedded/EmbeddedSolrServer.java | 1 - .../client/solrj/embedded/JettyConfig.java | 1 - .../solrj/embedded/JettySolrRunner.java | 1 - .../solr/client/solrj/embedded/SSLConfig.java | 3 +- .../client/solrj/embedded/package-info.java | 1 - .../org/apache/solr/cloud/ActionThrottle.java | 7 +- .../java/org/apache/solr/cloud/Assign.java | 27 +++--- .../solr/cloud/CloudConfigSetService.java | 1 - .../apache/solr/cloud/CloudDescriptor.java | 3 +- .../java/org/apache/solr/cloud/CloudUtil.java | 3 +- .../cloud/CurrentCoreDescriptorProvider.java | 3 +- .../org/apache/solr/cloud/DistributedMap.java | 3 +- .../apache/solr/cloud/DistributedQueue.java | 4 +- .../apache/solr/cloud/ElectionContext.java | 3 +- .../org/apache/solr/cloud/LeaderElector.java | 3 +- .../cloud/LeaderInitiatedRecoveryThread.java | 33 ++++--- .../java/org/apache/solr/cloud/Overseer.java | 27 +++--- .../OverseerAutoReplicaFailoverThread.java | 3 +- .../OverseerCollectionConfigSetProcessor.java | 3 +- .../OverseerCollectionMessageHandler.java | 3 +- .../OverseerConfigSetMessageHandler.java | 3 +- .../solr/cloud/OverseerMessageHandler.java | 3 +- .../solr/cloud/OverseerNodePrioritizer.java | 7 +- .../solr/cloud/OverseerSolrResponse.java | 3 +- .../solr/cloud/OverseerTaskProcessor.java | 3 +- .../apache/solr/cloud/OverseerTaskQueue.java | 7 +- .../apache/solr/cloud/RecoveryStrategy.java | 3 +- .../solr/cloud/SizeLimitedDistributedMap.java | 3 +- .../org/apache/solr/cloud/SolrZkServer.java | 27 +++--- .../org/apache/solr/cloud/SyncStrategy.java | 15 ++-- .../src/java/org/apache/solr/cloud/ZkCLI.java | 33 ++++--- .../org/apache/solr/cloud/ZkController.java | 3 +- .../solr/cloud/ZkSolrResourceLoader.java | 3 +- .../cloud/overseer/ClusterStateMutator.java | 7 +- .../cloud/overseer/CollectionMutator.java | 7 +- .../solr/cloud/overseer/OverseerAction.java | 3 +- .../solr/cloud/overseer/ReplicaMutator.java | 7 +- .../solr/cloud/overseer/SliceMutator.java | 7 +- .../solr/cloud/overseer/ZkStateWriter.java | 3 +- .../solr/cloud/overseer/ZkWriteCommand.java | 3 +- .../solr/cloud/overseer/package-info.java | 1 - .../org/apache/solr/cloud/package-info.java | 1 - .../solr/cloud/rule/ImplicitSnitch.java | 4 +- .../solr/cloud/rule/RemoteCallback.java | 3 +- .../solr/cloud/rule/ReplicaAssigner.java | 7 +- .../java/org/apache/solr/cloud/rule/Rule.java | 4 +- .../org/apache/solr/cloud/rule/Snitch.java | 3 +- .../apache/solr/cloud/rule/SnitchContext.java | 3 +- .../apache/solr/cloud/rule/package-info.java | 1 - .../solr/core/AbstractSolrEventListener.java | 1 - .../solr/core/CachingDirectoryFactory.java | 3 +- .../java/org/apache/solr/core/CloseHook.java | 4 +- .../org/apache/solr/core/CloudConfig.java | 3 +- .../org/apache/solr/core/CodecFactory.java | 3 +- .../src/java/org/apache/solr/core/Config.java | 1 - .../org/apache/solr/core/ConfigOverlay.java | 3 +- .../java/org/apache/solr/core/ConfigSet.java | 1 - .../apache/solr/core/ConfigSetProperties.java | 1 - .../apache/solr/core/ConfigSetService.java | 1 - .../org/apache/solr/core/CoreContainer.java | 1 - .../org/apache/solr/core/CoreDescriptor.java | 1 - .../solr/core/CorePropertiesLocator.java | 3 +- .../org/apache/solr/core/CoresLocator.java | 3 +- .../org/apache/solr/core/Diagnostics.java | 4 +- .../apache/solr/core/DirectoryFactory.java | 3 +- .../solr/core/EphemeralDirectoryFactory.java | 3 +- .../solr/core/HdfsDirectoryFactory.java | 3 +- .../org/apache/solr/core/ImplicitPlugins.java | 4 +- .../solr/core/IndexDeletionPolicyWrapper.java | 3 +- .../apache/solr/core/IndexReaderFactory.java | 3 +- .../java/org/apache/solr/core/InitParams.java | 3 +- .../org/apache/solr/core/JarRepository.java | 3 +- .../solr/core/MMapDirectoryFactory.java | 4 +- .../org/apache/solr/core/MapSerializable.java | 4 +- .../org/apache/solr/core/MemClassLoader.java | 3 +- .../solr/core/NIOFSDirectoryFactory.java | 3 +- .../solr/core/NRTCachingDirectoryFactory.java | 1 - .../java/org/apache/solr/core/NodeConfig.java | 3 +- .../java/org/apache/solr/core/PluginBag.java | 4 +- .../apache/solr/core/QuerySenderListener.java | 1 - .../apache/solr/core/RAMDirectoryFactory.java | 1 - .../org/apache/solr/core/RequestHandlers.java | 1 - .../org/apache/solr/core/RequestParams.java | 3 +- .../solr/core/RunExecutableListener.java | 1 - .../apache/solr/core/SchemaCodecFactory.java | 33 ++++--- .../solr/core/SimpleFSDirectoryFactory.java | 3 +- .../java/org/apache/solr/core/SolrConfig.java | 1 - .../java/org/apache/solr/core/SolrCore.java | 1 - .../java/org/apache/solr/core/SolrCores.java | 3 +- .../apache/solr/core/SolrDeletionPolicy.java | 3 +- .../apache/solr/core/SolrEventListener.java | 1 - .../org/apache/solr/core/SolrInfoMBean.java | 1 - .../apache/solr/core/SolrResourceLoader.java | 1 - .../core/SolrResourceNotFoundException.java | 1 - .../org/apache/solr/core/SolrXmlConfig.java | 3 +- .../solr/core/StandardDirectoryFactory.java | 3 +- .../solr/core/StandardIndexReaderFactory.java | 3 +- .../org/apache/solr/core/ZkContainer.java | 3 +- .../org/apache/solr/core/package-info.java | 1 - .../handler/AnalysisRequestHandlerBase.java | 1 - .../org/apache/solr/handler/BlobHandler.java | 3 +- .../solr/handler/CdcrBufferManager.java | 3 +- .../solr/handler/CdcrBufferStateManager.java | 3 +- .../solr/handler/CdcrLeaderStateManager.java | 7 +- .../org/apache/solr/handler/CdcrParams.java | 3 +- .../solr/handler/CdcrProcessStateManager.java | 7 +- .../apache/solr/handler/CdcrReplicator.java | 3 +- .../solr/handler/CdcrReplicatorManager.java | 3 +- .../solr/handler/CdcrReplicatorScheduler.java | 3 +- .../solr/handler/CdcrReplicatorState.java | 3 +- .../solr/handler/CdcrRequestHandler.java | 3 +- .../apache/solr/handler/CdcrStateManager.java | 3 +- .../handler/CdcrUpdateLogSynchronizer.java | 15 ++-- .../handler/ContentStreamHandlerBase.java | 3 +- .../solr/handler/ContentStreamLoader.java | 4 +- .../DocumentAnalysisRequestHandler.java | 1 - .../solr/handler/DumpRequestHandler.java | 1 - .../handler/FieldAnalysisRequestHandler.java | 1 - .../solr/handler/MoreLikeThisHandler.java | 1 - .../solr/handler/NestedRequestHandler.java | 3 +- .../solr/handler/NotFoundRequestHandler.java | 3 +- .../solr/handler/OldBackupDirectory.java | 3 +- .../solr/handler/PingRequestHandler.java | 1 - .../solr/handler/RealTimeGetHandler.java | 1 - .../solr/handler/RequestHandlerBase.java | 1 - .../solr/handler/RequestHandlerUtils.java | 1 - .../org/apache/solr/handler/RestoreCore.java | 3 +- .../org/apache/solr/handler/SQLHandler.java | 3 +- .../apache/solr/handler/SchemaHandler.java | 4 +- .../solr/handler/SolrConfigHandler.java | 4 +- .../solr/handler/StandardRequestHandler.java | 1 - .../apache/solr/handler/StreamHandler.java | 1 - .../solr/handler/UpdateRequestHandler.java | 1 - .../solr/handler/admin/AdminHandlers.java | 1 - .../solr/handler/admin/ClusterStatus.java | 4 +- .../solr/handler/admin/ConfigSetsHandler.java | 7 +- .../solr/handler/admin/CoreAdminHandler.java | 1 - .../handler/admin/CoreAdminOperation.java | 3 +- .../solr/handler/admin/InfoHandler.java | 3 +- .../solr/handler/admin/LoggingHandler.java | 3 +- .../handler/admin/LukeRequestHandler.java | 1 - .../solr/handler/admin/PluginInfoHandler.java | 1 - .../admin/PropertiesRequestHandler.java | 1 - .../solr/handler/admin/RebalanceLeaders.java | 33 ++++--- .../handler/admin/SecurityConfHandler.java | 3 +- .../admin/SegmentsInfoRequestHandler.java | 33 ++++--- .../handler/admin/ShowFileRequestHandler.java | 1 - .../handler/admin/SolrInfoMBeanHandler.java | 3 +- .../solr/handler/admin/SystemInfoHandler.java | 1 - .../solr/handler/admin/ThreadDumpHandler.java | 1 - .../handler/admin/ZookeeperInfoHandler.java | 1 - .../solr/handler/admin/package-info.java | 1 - .../handler/component/DateFacetProcessor.java | 3 +- .../handler/component/DebugComponent.java | 1 - .../handler/component/ExpandComponent.java | 1 - .../handler/component/FacetComponent.java | 1 - .../handler/component/FieldFacetStats.java | 3 +- .../handler/component/HighlightComponent.java | 1 - .../handler/component/HttpShardHandler.java | 3 +- .../component/HttpShardHandlerFactory.java | 3 +- .../component/IterativeMergeStrategy.java | 31 ++++--- .../solr/handler/component/MergeStrategy.java | 31 ++++--- .../component/MoreLikeThisComponent.java | 1 - .../solr/handler/component/PivotFacet.java | 1 - .../handler/component/PivotFacetField.java | 1 - .../PivotFacetFieldValueCollection.java | 3 +- .../handler/component/PivotFacetHelper.java | 1 - .../component/PivotFacetProcessor.java | 3 +- .../handler/component/PivotFacetValue.java | 3 +- .../handler/component/QueryComponent.java | 1 - .../component/QueryElevationComponent.java | 1 - .../component/RangeFacetProcessor.java | 3 +- .../handler/component/RangeFacetRequest.java | 7 +- .../component/RealTimeGetComponent.java | 3 +- .../handler/component/ResponseBuilder.java | 1 - .../component/ResponseLogComponent.java | 3 +- .../handler/component/SearchComponent.java | 1 - .../solr/handler/component/SearchHandler.java | 1 - .../component/ShardFieldSortedHitQueue.java | 3 +- .../solr/handler/component/ShardHandler.java | 4 +- .../component/ShardHandlerFactory.java | 4 +- .../solr/handler/component/ShardResponse.java | 3 +- .../component/SpatialHeatmapFacets.java | 3 +- .../component/SpellCheckComponent.java | 1 - .../component/SpellCheckMergeData.java | 3 +- .../handler/component/StatsComponent.java | 1 - .../solr/handler/component/StatsField.java | 1 - .../solr/handler/component/StatsValues.java | 2 - .../handler/component/StatsValuesFactory.java | 3 +- .../handler/component/SuggestComponent.java | 3 +- .../component/TermVectorComponent.java | 34 ++++--- .../handler/component/TermsComponent.java | 3 +- .../solr/handler/component/package-info.java | 1 - .../apache/solr/handler/loader/CSVLoader.java | 1 - .../solr/handler/loader/CSVLoaderBase.java | 1 - .../handler/loader/ContentStreamLoader.java | 4 +- .../solr/handler/loader/JavabinLoader.java | 1 - .../solr/handler/loader/JsonLoader.java | 3 +- .../apache/solr/handler/loader/XMLLoader.java | 3 +- .../solr/handler/loader/package-info.java | 1 - .../org/apache/solr/handler/package-info.java | 1 - .../BreakIteratorBoundaryScanner.java | 1 - .../apache/solr/highlight/DefaultEncoder.java | 1 - .../highlight/HighlightingPluginBase.java | 1 - .../apache/solr/highlight/HtmlEncoder.java | 1 - .../highlight/PostingsSolrHighlighter.java | 3 +- .../highlight/ScoreOrderFragmentsBuilder.java | 1 - .../solr/highlight/SimpleBoundaryScanner.java | 1 - .../solr/highlight/SimpleFragListBuilder.java | 1 - .../highlight/SimpleFragmentsBuilder.java | 1 - .../solr/highlight/SingleFragListBuilder.java | 1 - .../solr/highlight/SolrBoundaryScanner.java | 1 - .../apache/solr/highlight/SolrEncoder.java | 1 - .../apache/solr/highlight/SolrFormatter.java | 1 - .../solr/highlight/SolrFragListBuilder.java | 1 - .../apache/solr/highlight/SolrFragmenter.java | 1 - .../solr/highlight/SolrFragmentsBuilder.java | 1 - .../solr/highlight/SolrHighlighter.java | 3 +- .../highlight/WeightedFragListBuilder.java | 1 - .../apache/solr/highlight/package-info.java | 1 - .../solr/index/hdfs/CheckHdfsIndex.java | 3 +- .../apache/solr/index/hdfs/package-info.java | 1 - .../apache/solr/internal/csv/CSVParser.java | 6 +- .../apache/solr/internal/csv/CSVPrinter.java | 6 +- .../apache/solr/internal/csv/CSVStrategy.java | 6 +- .../apache/solr/internal/csv/CSVUtils.java | 6 +- .../apache/solr/internal/csv/CharBuffer.java | 26 +++--- .../internal/csv/ExtendedBufferedReader.java | 6 +- .../solr/internal/csv/package-info.java | 1 - .../solr/internal/csv/writer/CSVConfig.java | 26 +++--- .../internal/csv/writer/CSVConfigGuesser.java | 26 +++--- .../solr/internal/csv/writer/CSVField.java | 26 +++--- .../solr/internal/csv/writer/CSVWriter.java | 26 +++--- .../internal/csv/writer/package-info.java | 1 - .../org/apache/solr/logging/CircularList.java | 1 - .../apache/solr/logging/ListenerConfig.java | 5 +- .../org/apache/solr/logging/LogWatcher.java | 1 - .../apache/solr/logging/LogWatcherConfig.java | 3 +- .../org/apache/solr/logging/LoggerInfo.java | 1 - .../solr/logging/MDCLoggingContext.java | 3 +- .../apache/solr/logging/jul/package-info.java | 1 - .../solr/logging/log4j/package-info.java | 1 - .../org/apache/solr/logging/package-info.java | 1 - .../java/org/apache/solr/package-info.java | 1 - .../apache/solr/parser/FastCharStream.java | 5 +- .../solr/parser/SolrQueryParserBase.java | 1 - .../org/apache/solr/parser/package-info.java | 1 - .../org/apache/solr/query/FilterQuery.java | 3 +- .../org/apache/solr/query/SolrRangeQuery.java | 3 +- .../apache/solr/request/DocValuesFacets.java | 3 +- .../apache/solr/request/DocValuesStats.java | 3 +- .../apache/solr/request/IntervalFacets.java | 33 ++++--- .../solr/request/LocalSolrQueryRequest.java | 1 - .../apache/solr/request/NumericFacets.java | 3 +- .../PerSegmentSingleValuedFaceting.java | 1 - .../org/apache/solr/request/SimpleFacets.java | 1 - .../apache/solr/request/SolrQueryRequest.java | 1 - .../solr/request/SolrQueryRequestBase.java | 1 - .../solr/request/SolrRequestHandler.java | 1 - .../apache/solr/request/SolrRequestInfo.java | 1 - .../apache/solr/request/json/JSONUtil.java | 4 +- .../apache/solr/request/json/ObjectUtil.java | 4 +- .../apache/solr/request/json/RequestUtil.java | 4 +- .../solr/request/macro/MacroExpander.java | 3 +- .../org/apache/solr/request/package-info.java | 1 - .../solr/response/BasicResultContext.java | 3 +- .../response/BinaryQueryResponseWriter.java | 4 +- .../solr/response/CSVResponseWriter.java | 1 - .../apache/solr/response/DocsStreamer.java | 3 +- .../solr/response/JSONResponseWriter.java | 1 - .../solr/response/PHPResponseWriter.java | 1 - .../response/PHPSerializedResponseWriter.java | 1 - .../solr/response/PythonResponseWriter.java | 1 - .../solr/response/QueryResponseWriter.java | 1 - .../response/QueryResponseWriterUtil.java | 1 - .../solr/response/RawResponseWriter.java | 1 - .../apache/solr/response/ResultContext.java | 1 - .../response/SchemaXmlResponseWriter.java | 1 - .../apache/solr/response/SchemaXmlWriter.java | 3 +- .../solr/response/SmileResponseWriter.java | 4 +- .../solr/response/SolrQueryResponse.java | 1 - .../solr/response/SortingResponseWriter.java | 1 - .../solr/response/TextResponseWriter.java | 1 - .../solr/response/XMLResponseWriter.java | 1 - .../org/apache/solr/response/XMLWriter.java | 1 - .../solr/response/XSLTResponseWriter.java | 1 - .../apache/solr/response/package-info.java | 1 - .../transform/BaseEditorialTransformer.java | 5 +- .../response/transform/DocTransformer.java | 1 - .../response/transform/DocTransformers.java | 1 - .../transform/ElevatedMarkerFactory.java | 3 +- .../transform/ExcludedMarkerFactory.java | 3 +- .../transform/TransformerFactory.java | 1 - .../solr/response/transform/package-info.java | 1 - .../apache/solr/rest/BaseSolrResource.java | 3 +- .../java/org/apache/solr/rest/DELETEable.java | 3 +- .../java/org/apache/solr/rest/GETable.java | 3 +- .../org/apache/solr/rest/ManagedResource.java | 3 +- .../solr/rest/ManagedResourceObserver.java | 3 +- .../solr/rest/ManagedResourceStorage.java | 3 +- .../java/org/apache/solr/rest/POSTable.java | 3 +- .../java/org/apache/solr/rest/PUTable.java | 3 +- .../org/apache/solr/rest/RestManager.java | 3 +- .../apache/solr/rest/SolrSchemaRestApi.java | 3 +- .../org/apache/solr/rest/package-info.java | 1 - .../solr/rest/schema/BaseFieldResource.java | 3 +- .../rest/schema/BaseFieldTypeResource.java | 3 +- .../schema/CopyFieldCollectionResource.java | 4 +- .../DynamicFieldCollectionResource.java | 3 +- .../rest/schema/DynamicFieldResource.java | 4 +- .../rest/schema/FieldCollectionResource.java | 4 +- .../solr/rest/schema/FieldResource.java | 3 +- .../schema/FieldTypeCollectionResource.java | 3 +- .../solr/rest/schema/FieldTypeResource.java | 3 +- .../solr/rest/schema/FieldTypeXmlAdapter.java | 3 +- .../BaseManagedTokenFilterFactory.java | 3 +- .../analysis/ManagedStopFilterFactory.java | 3 +- .../analysis/ManagedSynonymFilterFactory.java | 3 +- .../analysis/ManagedWordSetResource.java | 3 +- .../rest/schema/analysis/package-info.java | 1 - .../apache/solr/rest/schema/package-info.java | 1 - .../solr/schema/AbstractSpatialFieldType.java | 3 +- .../AbstractSpatialPrefixTreeFieldType.java | 3 +- .../solr/schema/AbstractSubTypeFieldType.java | 3 +- .../org/apache/solr/schema/BBoxField.java | 3 +- .../org/apache/solr/schema/BinaryField.java | 1 - .../org/apache/solr/schema/BoolField.java | 1 - .../schema/ClassicIndexSchemaFactory.java | 3 +- .../apache/solr/schema/CollationField.java | 3 +- .../solr/schema/CoordinateFieldType.java | 1 - .../org/apache/solr/schema/CopyField.java | 1 - .../org/apache/solr/schema/CurrencyField.java | 3 +- .../apache/solr/schema/DateRangeField.java | 3 +- .../solr/schema/DateValueFieldType.java | 1 - .../solr/schema/DoubleValueFieldType.java | 1 - .../org/apache/solr/schema/EnumField.java | 3 +- .../solr/schema/ExchangeRateProvider.java | 3 +- .../schema/ExternalFileFieldReloader.java | 1 - .../apache/solr/schema/FieldProperties.java | 1 - .../org/apache/solr/schema/FieldType.java | 1 - .../solr/schema/FieldTypePluginLoader.java | 1 - .../solr/schema/FloatValueFieldType.java | 1 - .../org/apache/solr/schema/GeoHashField.java | 1 - .../org/apache/solr/schema/IndexSchema.java | 1 - .../solr/schema/IndexSchemaFactory.java | 3 +- .../apache/solr/schema/IntValueFieldType.java | 1 - .../solr/schema/JsonPreAnalyzedParser.java | 33 ++++--- .../org/apache/solr/schema/LatLonType.java | 3 +- .../solr/schema/LongValueFieldType.java | 1 - .../solr/schema/ManagedIndexSchema.java | 3 +- .../schema/ManagedIndexSchemaFactory.java | 3 +- .../solr/schema/NumericValueFieldType.java | 1 - .../schema/OpenExchangeRatesOrgProvider.java | 3 +- .../org/apache/solr/schema/PointType.java | 1 - .../apache/solr/schema/PreAnalyzedField.java | 3 +- .../solr/schema/PrimitiveFieldType.java | 1 - .../apache/solr/schema/RandomSortField.java | 1 - .../schema/RptWithGeometrySpatialField.java | 3 +- .../org/apache/solr/schema/SchemaAware.java | 4 +- .../org/apache/solr/schema/SchemaField.java | 1 - .../org/apache/solr/schema/SchemaManager.java | 4 +- .../apache/solr/schema/SimilarityFactory.java | 3 +- .../solr/schema/SimplePreAnalyzedParser.java | 3 +- .../schema/SpatialPointVectorFieldType.java | 3 +- .../apache/solr/schema/SpatialQueryable.java | 4 +- .../SpatialRecursivePrefixTreeFieldType.java | 3 +- .../SpatialTermQueryPrefixTreeFieldType.java | 1 - .../java/org/apache/solr/schema/StrField.java | 1 - .../apache/solr/schema/StrFieldSource.java | 1 - .../org/apache/solr/schema/TextField.java | 1 - .../org/apache/solr/schema/TrieDateField.java | 1 - .../apache/solr/schema/TrieDoubleField.java | 1 - .../apache/solr/schema/TrieFloatField.java | 1 - .../org/apache/solr/schema/TrieIntField.java | 1 - .../org/apache/solr/schema/TrieLongField.java | 1 - .../org/apache/solr/schema/UUIDField.java | 3 +- .../solr/schema/ZkIndexSchemaReader.java | 3 +- .../org/apache/solr/schema/package-info.java | 1 - .../apache/solr/search/AnalyticsQuery.java | 31 ++++--- .../org/apache/solr/search/BitDocSet.java | 1 - .../solr/search/BitsFilteredDocIdSet.java | 3 +- .../solr/search/BitsFilteredPostingsEnum.java | 3 +- .../org/apache/solr/search/CacheConfig.java | 1 - .../apache/solr/search/CacheRegenerator.java | 1 - .../solr/search/CollapsingQParserPlugin.java | 1 - .../search/ComplexPhraseQParserPlugin.java | 3 +- .../org/apache/solr/search/CursorMark.java | 1 - .../solr/search/DelegatingCollector.java | 1 - .../org/apache/solr/search/DocIterator.java | 1 - .../java/org/apache/solr/search/DocList.java | 1 - .../org/apache/solr/search/DocListAndSet.java | 1 - .../java/org/apache/solr/search/DocSet.java | 1 - .../org/apache/solr/search/DocSetBase.java | 1 - .../org/apache/solr/search/DocSetBuilder.java | 3 +- .../apache/solr/search/DocSetCollector.java | 3 +- .../apache/solr/search/DocSetProducer.java | 3 +- .../org/apache/solr/search/DocSetUtil.java | 4 +- .../java/org/apache/solr/search/DocSlice.java | 1 - .../search/EarlyTerminatingCollector.java | 3 +- .../EarlyTerminatingCollectorException.java | 4 +- .../solr/search/ExportQParserPlugin.java | 1 - .../solr/search/ExtendedDismaxQParser.java | 1 - .../search/ExtendedDismaxQParserPlugin.java | 1 - .../org/apache/solr/search/ExtendedQuery.java | 1 - .../apache/solr/search/ExtendedQueryBase.java | 1 - .../org/apache/solr/search/FastLRUCache.java | 3 +- .../org/apache/solr/search/FieldParams.java | 3 +- .../java/org/apache/solr/search/Filter.java | 3 +- .../apache/solr/search/FilteredDocIdSet.java | 3 +- .../solr/search/FunctionRangeQuery.java | 1 - .../java/org/apache/solr/search/Grouping.java | 1 - .../org/apache/solr/search/HashDocSet.java | 1 - .../apache/solr/search/HashQParserPlugin.java | 1 - .../java/org/apache/solr/search/Insanity.java | 3 +- .../java/org/apache/solr/search/LFUCache.java | 3 +- .../java/org/apache/solr/search/LRUCache.java | 1 - .../apache/solr/search/NoOpRegenerator.java | 3 +- .../org/apache/solr/search/PostFilter.java | 1 - .../org/apache/solr/search/QueryCommand.java | 3 +- .../org/apache/solr/search/QueryContext.java | 3 +- .../org/apache/solr/search/QueryParsing.java | 1 - .../org/apache/solr/search/QueryResult.java | 3 +- .../apache/solr/search/QueryResultKey.java | 1 - .../org/apache/solr/search/QueryUtils.java | 1 - .../solr/search/QueryWrapperFilter.java | 3 +- .../org/apache/solr/search/RankQuery.java | 31 ++++--- .../solr/search/ReRankQParserPlugin.java | 1 - .../org/apache/solr/search/ScoreFilter.java | 1 - .../solr/search/SimpleQParserPlugin.java | 3 +- .../org/apache/solr/search/SolrCache.java | 1 - .../org/apache/solr/search/SolrCacheBase.java | 1 - .../solr/search/SolrConstantScoreQuery.java | 31 ++++--- .../apache/solr/search/SolrCoreParser.java | 3 +- .../solr/search/SolrFieldCacheMBean.java | 1 - .../org/apache/solr/search/SolrFilter.java | 1 - .../apache/solr/search/SolrIndexSearcher.java | 1 - .../apache/solr/search/SolrQueryParser.java | 1 - .../solr/search/SolrQueryTimeoutImpl.java | 3 +- .../java/org/apache/solr/search/SortSpec.java | 1 - .../apache/solr/search/SortSpecParsing.java | 31 ++++--- .../apache/solr/search/SortedIntDocSet.java | 1 - .../java/org/apache/solr/search/Sorting.java | 1 - .../solr/search/SpatialBoxQParserPlugin.java | 1 - .../solr/search/SpatialFilterQParser.java | 4 +- .../search/SpatialFilterQParserPlugin.java | 3 +- .../apache/solr/search/SpatialOptions.java | 3 +- .../org/apache/solr/search/StrParser.java | 7 +- .../solr/search/SurroundQParserPlugin.java | 4 +- .../org/apache/solr/search/SyntaxError.java | 1 - .../solr/search/TermsQParserPlugin.java | 3 +- .../org/apache/solr/search/WrappedQuery.java | 1 - .../apache/solr/search/XmlQParserPlugin.java | 3 +- .../solr/search/facet/AggValueSource.java | 3 +- .../org/apache/solr/search/facet/AvgAgg.java | 3 +- .../apache/solr/search/facet/BlockJoin.java | 4 +- .../apache/solr/search/facet/CountAgg.java | 3 +- .../solr/search/facet/FacetDebugInfo.java | 1 - .../apache/solr/search/facet/FacetField.java | 3 +- .../search/facet/FacetFieldProcessorDV.java | 3 +- .../facet/FacetFieldProcessorNumeric.java | 3 +- .../apache/solr/search/facet/FacetMerger.java | 3 +- .../apache/solr/search/facet/FacetModule.java | 3 +- .../solr/search/facet/FacetProcessor.java | 3 +- .../apache/solr/search/facet/FacetQuery.java | 3 +- .../apache/solr/search/facet/FacetRange.java | 3 +- .../solr/search/facet/FacetRequest.java | 3 +- .../apache/solr/search/facet/FieldUtil.java | 3 +- .../org/apache/solr/search/facet/HLLAgg.java | 3 +- .../apache/solr/search/facet/LegacyFacet.java | 4 +- .../org/apache/solr/search/facet/MaxAgg.java | 3 +- .../org/apache/solr/search/facet/MinAgg.java | 3 +- .../solr/search/facet/PercentileAgg.java | 3 +- .../search/facet/SimpleAggValueSource.java | 3 +- .../org/apache/solr/search/facet/SlotAcc.java | 3 +- .../solr/search/facet/StrAggValueSource.java | 3 +- .../org/apache/solr/search/facet/SumAgg.java | 3 +- .../apache/solr/search/facet/SumsqAgg.java | 3 +- .../solr/search/facet/UnInvertedField.java | 1 - .../apache/solr/search/facet/UniqueAgg.java | 3 +- .../solr/search/facet/UniqueSlotAcc.java | 3 +- .../function/CollapseScoreFunction.java | 1 - .../solr/search/function/OrdFieldSource.java | 1 - .../function/ReverseOrdFieldSource.java | 1 - .../function/ValueSourceRangeFilter.java | 1 - .../distance/GeoDistValueSourceParser.java | 3 +- .../function/distance/GeohashFunction.java | 3 +- .../distance/GeohashHaversineFunction.java | 4 +- .../distance/HaversineConstFunction.java | 3 +- .../function/distance/HaversineFunction.java | 3 +- .../distance/SquaredEuclideanFunction.java | 3 +- .../distance/StringDistanceFunction.java | 3 +- .../distance/VectorDistanceFunction.java | 3 +- .../function/distance/package-info.java | 1 - .../solr/search/function/package-info.java | 1 - .../apache/solr/search/grouping/Command.java | 3 +- .../solr/search/grouping/CommandHandler.java | 3 +- .../grouping/GroupingSpecification.java | 3 +- .../grouping/collector/FilterCollector.java | 3 +- .../grouping/collector/package-info.java | 1 - .../distributed/ShardRequestFactory.java | 3 +- .../distributed/ShardResponseProcessor.java | 3 +- .../distributed/command/GroupConverter.java | 3 +- .../distributed/command/QueryCommand.java | 3 +- .../command/QueryCommandResult.java | 3 +- .../command/SearchGroupsFieldCommand.java | 3 +- .../SearchGroupsFieldCommandResult.java | 3 +- .../command/TopGroupsFieldCommand.java | 3 +- .../distributed/command/package-info.java | 1 - .../grouping/distributed/package-info.java | 1 - .../SearchGroupsRequestFactory.java | 3 +- .../StoredFieldsShardRequestFactory.java | 3 +- .../TopGroupsShardRequestFactory.java | 3 +- .../requestfactory/package-info.java | 1 - .../SearchGroupShardResponseProcessor.java | 3 +- .../StoredFieldsShardResponseProcessor.java | 3 +- .../TopGroupsShardResponseProcessor.java | 3 +- .../responseprocessor/package-info.java | 1 - .../SearchGroupsResultTransformer.java | 3 +- .../ShardResultTransformer.java | 3 +- .../TopGroupsResultTransformer.java | 3 +- .../shardresultserializer/package-info.java | 1 - .../EndResultTransformer.java | 3 +- .../GroupedEndResultTransformer.java | 3 +- .../MainEndResultTransformer.java | 3 +- .../SimpleEndResultTransformer.java | 3 +- .../endresulttransformer/package-info.java | 1 - .../solr/search/grouping/package-info.java | 1 - .../apache/solr/search/join/BitSetSlice.java | 1 - .../search/join/BlockJoinChildQParser.java | 1 - .../join/BlockJoinChildQParserPlugin.java | 1 - .../join/BlockJoinDocSetFacetComponent.java | 33 ++++--- .../search/join/BlockJoinFacetCollector.java | 3 +- .../search/join/BlockJoinFacetComponent.java | 3 +- .../search/join/BlockJoinFacetFilter.java | 3 +- .../join/BlockJoinFieldFacetAccumulator.java | 3 +- .../search/join/BlockJoinParentQParser.java | 1 - .../join/BlockJoinParentQParserPlugin.java | 1 - .../solr/search/join/FrontierQuery.java | 3 +- .../solr/search/join/GraphQParserPlugin.java | 3 +- .../apache/solr/search/join/GraphQuery.java | 3 +- .../solr/search/join/GraphQueryParser.java | 3 +- .../solr/search/join/GraphTermsCollector.java | 3 +- .../search/join/ScoreJoinQParserPlugin.java | 1 - .../solr/search/join/ScoreModeParser.java | 19 ++-- .../apache/solr/search/join/package-info.java | 1 - .../solr/search/mlt/CloudMLTQParser.java | 3 +- .../solr/search/mlt/MLTQParserPlugin.java | 3 +- .../solr/search/mlt/SimpleMLTQParser.java | 3 +- .../apache/solr/search/mlt/package-info.java | 1 - .../org/apache/solr/search/package-info.java | 1 - .../similarities/BM25SimilarityFactory.java | 3 +- .../ClassicSimilarityFactory.java | 3 +- .../similarities/DFISimilarityFactory.java | 3 +- .../similarities/DFRSimilarityFactory.java | 3 +- .../similarities/IBSimilarityFactory.java | 3 +- .../LMDirichletSimilarityFactory.java | 3 +- .../LMJelinekMercerSimilarityFactory.java | 3 +- .../similarities/SchemaSimilarityFactory.java | 3 +- .../SweetSpotSimilarityFactory.java | 3 +- .../search/similarities/package-info.java | 1 - .../search/stats/CachedSearcherStats.java | 3 +- .../solr/search/stats/CollectionStats.java | 5 +- .../search/stats/ExactSharedStatsCache.java | 3 +- .../solr/search/stats/ExactStatsCache.java | 3 +- .../solr/search/stats/LRUStatsCache.java | 3 +- .../solr/search/stats/LocalStatsCache.java | 7 +- .../solr/search/stats/LocalStatsSource.java | 3 +- .../apache/solr/search/stats/StatsCache.java | 3 +- .../apache/solr/search/stats/StatsSource.java | 3 +- .../apache/solr/search/stats/StatsUtil.java | 7 +- .../apache/solr/search/stats/TermStats.java | 3 +- .../solr/search/stats/package-info.java | 1 - .../solr/security/AuthenticationPlugin.java | 33 ++++--- .../solr/security/AuthorizationContext.java | 3 +- .../solr/security/AuthorizationPlugin.java | 3 +- .../solr/security/AuthorizationResponse.java | 3 +- .../apache/solr/security/BasicAuthPlugin.java | 4 +- .../solr/security/ConfigEditablePlugin.java | 3 +- .../security/HttpClientInterceptorPlugin.java | 4 +- .../apache/solr/security/KerberosFilter.java | 25 +++--- .../apache/solr/security/KerberosPlugin.java | 33 ++++--- .../security/PKIAuthenticationPlugin.java | 3 +- .../RuleBasedAuthorizationPlugin.java | 3 +- .../solr/security/SecurityPluginHolder.java | 4 +- .../Sha256AuthenticationProvider.java | 3 +- .../apache/solr/security/package-info.java | 1 - .../apache/solr/servlet/BaseSolrFilter.java | 1 - .../apache/solr/servlet/BaseSolrServlet.java | 1 - .../servlet/CheckLoggingConfiguration.java | 1 - .../solr/servlet/DirectSolrConnection.java | 1 - .../org/apache/solr/servlet/HttpSolrCall.java | 7 +- .../solr/servlet/LoadAdminUiServlet.java | 1 - .../apache/solr/servlet/RedirectServlet.java | 1 - .../apache/solr/servlet/ResponseUtils.java | 3 +- .../solr/servlet/SolrDispatchFilter.java | 1 - .../solr/servlet/SolrRequestParsers.java | 1 - .../servlet/cache/HttpCacheHeaderUtil.java | 1 - .../org/apache/solr/servlet/cache/Method.java | 1 - .../solr/servlet/cache/package-info.java | 1 - .../org/apache/solr/servlet/package-info.java | 1 - .../spelling/AbstractLuceneSpellChecker.java | 5 +- .../spelling/ConjunctionSolrSpellChecker.java | 3 +- .../solr/spelling/DirectSolrSpellChecker.java | 3 +- .../solr/spelling/IndexBasedSpellChecker.java | 3 +- .../solr/spelling/PossibilityIterator.java | 3 +- .../apache/solr/spelling/QueryConverter.java | 3 +- .../org/apache/solr/spelling/ResultEntry.java | 3 +- .../solr/spelling/SolrSpellChecker.java | 3 +- .../solr/spelling/SpellCheckCollation.java | 3 +- .../solr/spelling/SpellCheckCollator.java | 3 +- .../solr/spelling/SpellCheckCorrection.java | 3 +- .../apache/solr/spelling/SpellingOptions.java | 17 ++-- .../solr/spelling/SpellingQueryConverter.java | 1 - .../apache/solr/spelling/SpellingResult.java | 3 +- .../solr/spelling/SuggestQueryConverter.java | 3 +- .../spelling/WordBreakSolrSpellChecker.java | 3 +- .../apache/solr/spelling/package-info.java | 1 - .../spelling/suggest/DictionaryFactory.java | 3 +- .../suggest/DocumentDictionaryFactory.java | 3 +- .../DocumentExpressionDictionaryFactory.java | 3 +- .../suggest/FileDictionaryFactory.java | 3 +- .../HighFrequencyDictionaryFactory.java | 3 +- .../solr/spelling/suggest/LookupFactory.java | 3 +- .../solr/spelling/suggest/SolrSuggester.java | 3 +- .../solr/spelling/suggest/Suggester.java | 1 - .../spelling/suggest/SuggesterOptions.java | 3 +- .../spelling/suggest/SuggesterParams.java | 3 +- .../spelling/suggest/SuggesterResult.java | 3 +- .../fst/AnalyzingInfixLookupFactory.java | 3 +- .../suggest/fst/AnalyzingLookupFactory.java | 3 +- .../fst/BlendedInfixLookupFactory.java | 3 +- .../suggest/fst/FSTLookupFactory.java | 3 +- .../suggest/fst/FreeTextLookupFactory.java | 23 +++-- .../suggest/fst/FuzzyLookupFactory.java | 3 +- .../suggest/fst/WFSTLookupFactory.java | 3 +- .../spelling/suggest/fst/package-info.java | 1 - .../suggest/jaspell/JaspellLookupFactory.java | 7 +- .../suggest/jaspell/package-info.java | 1 - .../solr/spelling/suggest/package-info.java | 1 - .../suggest/tst/TSTLookupFactory.java | 3 +- .../spelling/suggest/tst/package-info.java | 1 - .../solr/store/blockcache/BlockCache.java | 3 +- .../solr/store/blockcache/BlockCacheKey.java | 4 +- .../store/blockcache/BlockCacheLocation.java | 3 +- .../solr/store/blockcache/BlockDirectory.java | 3 +- .../store/blockcache/BlockDirectoryCache.java | 3 +- .../solr/store/blockcache/BlockLocks.java | 3 +- .../solr/store/blockcache/BufferStore.java | 3 +- .../apache/solr/store/blockcache/Cache.java | 3 +- .../store/blockcache/CachedIndexOutput.java | 3 +- .../blockcache/CustomBufferedIndexInput.java | 3 +- .../apache/solr/store/blockcache/Metrics.java | 3 +- .../blockcache/ReusedBufferedIndexOutput.java | 3 +- .../apache/solr/store/blockcache/Store.java | 3 +- .../solr/store/blockcache/package-info.java | 1 - .../apache/solr/store/hdfs/HdfsDirectory.java | 3 +- .../solr/store/hdfs/HdfsFileReader.java | 3 +- .../solr/store/hdfs/HdfsFileWriter.java | 3 +- .../solr/store/hdfs/HdfsLocalityReporter.java | 3 +- .../solr/store/hdfs/HdfsLockFactory.java | 3 +- .../apache/solr/store/hdfs/package-info.java | 1 - .../apache/solr/update/AddUpdateCommand.java | 1 - .../solr/update/CdcrTransactionLog.java | 3 +- .../org/apache/solr/update/CdcrUpdateLog.java | 3 +- .../org/apache/solr/update/CommitTracker.java | 7 +- .../solr/update/CommitUpdateCommand.java | 1 - .../solr/update/DefaultSolrCoreState.java | 3 +- .../solr/update/DeleteByQueryWrapper.java | 3 +- .../solr/update/DeleteUpdateCommand.java | 1 - .../solr/update/DirectUpdateHandler2.java | 1 - .../apache/solr/update/DocumentBuilder.java | 1 - .../solr/update/HdfsTransactionLog.java | 1 - .../org/apache/solr/update/HdfsUpdateLog.java | 1 - .../apache/solr/update/LoggingInfoStream.java | 1 - .../apache/solr/update/MemOutputStream.java | 1 - .../solr/update/MergeIndexesCommand.java | 1 - .../java/org/apache/solr/update/PeerSync.java | 1 - .../solr/update/RollbackUpdateCommand.java | 1 - .../solr/update/SolrCmdDistributor.java | 3 +- .../org/apache/solr/update/SolrCoreState.java | 3 +- .../apache/solr/update/SolrIndexConfig.java | 1 - .../apache/solr/update/SolrIndexSplitter.java | 1 - .../apache/solr/update/SolrIndexWriter.java | 1 - .../apache/solr/update/SplitIndexCommand.java | 1 - .../solr/update/StreamingSolrClients.java | 3 +- .../apache/solr/update/TransactionLog.java | 1 - .../org/apache/solr/update/UpdateCommand.java | 1 - .../org/apache/solr/update/UpdateHandler.java | 1 - .../org/apache/solr/update/UpdateLog.java | 1 - .../solr/update/UpdateShardHandler.java | 3 +- .../solr/update/UpdateShardHandlerConfig.java | 3 +- .../org/apache/solr/update/VersionBucket.java | 1 - .../org/apache/solr/update/VersionInfo.java | 1 - .../org/apache/solr/update/package-info.java | 1 - ...actDefaultValueUpdateProcessorFactory.java | 1 - ...AddSchemaFieldsUpdateProcessorFactory.java | 1 - ...uesOrNoneFieldMutatingUpdateProcessor.java | 1 - .../processor/AtomicUpdateDocumentMerger.java | 7 +- .../update/processor/CdcrUpdateProcessor.java | 3 +- .../processor/CdcrUpdateProcessorFactory.java | 3 +- .../ConcatFieldUpdateProcessorFactory.java | 1 - ...ountFieldValuesUpdateProcessorFactory.java | 1 - .../DefaultValueUpdateProcessorFactory.java | 1 - .../processor/DistributedUpdateProcessor.java | 7 +- .../DistributedUpdateProcessorFactory.java | 3 +- .../DistributingUpdateProcessorFactory.java | 1 - ...sedVersionConstraintsProcessorFactory.java | 1 - .../DocExpirationUpdateProcessorFactory.java | 1 - .../FieldLengthUpdateProcessorFactory.java | 1 - .../FieldMutatingUpdateProcessor.java | 1 - .../FieldMutatingUpdateProcessorFactory.java | 1 - ...eldNameMutatingUpdateProcessorFactory.java | 4 +- .../FieldValueMutatingUpdateProcessor.java | 1 - ...ieldValueSubsetUpdateProcessorFactory.java | 1 - ...FirstFieldValueUpdateProcessorFactory.java | 1 - .../HTMLStripFieldUpdateProcessorFactory.java | 1 - ...eCommitOptimizeUpdateProcessorFactory.java | 1 - .../IgnoreFieldUpdateProcessorFactory.java | 1 - .../LastFieldValueUpdateProcessorFactory.java | 1 - .../processor/LogUpdateProcessorFactory.java | 1 - .../update/processor/Lookup3Signature.java | 3 +- .../solr/update/processor/MD5Signature.java | 3 +- .../MaxFieldValueUpdateProcessorFactory.java | 1 - .../MinFieldValueUpdateProcessorFactory.java | 1 - ...oOpDistributingUpdateProcessorFactory.java | 1 - ...rseBooleanFieldUpdateProcessorFactory.java | 1 - .../ParseDateFieldUpdateProcessorFactory.java | 1 - ...arseDoubleFieldUpdateProcessorFactory.java | 1 - ...ParseFloatFieldUpdateProcessorFactory.java | 1 - .../ParseIntFieldUpdateProcessorFactory.java | 1 - .../ParseLongFieldUpdateProcessorFactory.java | 1 - ...rseNumericFieldUpdateProcessorFactory.java | 1 - .../PreAnalyzedUpdateProcessorFactory.java | 33 ++++--- ...emoveBlankFieldUpdateProcessorFactory.java | 1 - .../processor/RunUpdateProcessorFactory.java | 1 - .../processor/ScriptEngineCustomizer.java | 1 - .../solr/update/processor/Signature.java | 3 +- .../SignatureUpdateProcessorFactory.java | 3 +- .../SimpleUpdateProcessorFactory.java | 3 +- ...StatelessScriptUpdateProcessorFactory.java | 3 +- .../processor/TextProfileSignature.java | 3 +- .../TimestampUpdateProcessorFactory.java | 1 - .../TrimFieldUpdateProcessorFactory.java | 1 - .../TruncateFieldUpdateProcessorFactory.java | 1 - .../processor/UUIDUpdateProcessorFactory.java | 1 - .../UniqFieldsUpdateProcessorFactory.java | 3 +- .../processor/UpdateRequestProcessor.java | 1 - .../UpdateRequestProcessorChain.java | 1 - .../UpdateRequestProcessorFactory.java | 1 - .../solr/update/processor/package-info.java | 1 - .../apache/solr/util/AdjustableSemaphore.java | 3 +- .../org/apache/solr/util/BoundedTreeSet.java | 2 - .../apache/solr/util/CommandOperation.java | 3 +- .../apache/solr/util/ConcurrentLFUCache.java | 3 +- .../apache/solr/util/ConcurrentLRUCache.java | 3 +- .../java/org/apache/solr/util/CryptoKeys.java | 3 +- .../java/org/apache/solr/util/DOMUtil.java | 3 +- .../org/apache/solr/util/DateFormatUtil.java | 3 +- .../org/apache/solr/util/DateMathParser.java | 1 - .../solr/util/DefaultSolrThreadFactory.java | 3 +- .../org/apache/solr/util/DistanceUnits.java | 19 ++-- .../org/apache/solr/util/FSHDFSUtils.java | 3 +- .../java/org/apache/solr/util/FastWriter.java | 3 +- .../java/org/apache/solr/util/FileUtils.java | 3 +- .../java/org/apache/solr/util/HdfsUtil.java | 17 ++-- .../apache/solr/util/LongPriorityQueue.java | 7 +- .../org/apache/solr/util/MapListener.java | 3 +- .../org/apache/solr/util/NumberUtils.java | 1 - .../org/apache/solr/util/PivotListEntry.java | 3 +- .../java/org/apache/solr/util/PrimUtils.java | 3 +- .../solr/util/PropertiesInputStream.java | 3 +- .../solr/util/PropertiesOutputStream.java | 3 +- .../org/apache/solr/util/PropertiesUtil.java | 3 +- .../src/java/org/apache/solr/util/RTimer.java | 3 +- .../java/org/apache/solr/util/RTimerTree.java | 3 +- .../apache/solr/util/RecordingJSONParser.java | 4 +- .../java/org/apache/solr/util/RefCounted.java | 1 - .../org/apache/solr/util/RegexFileFilter.java | 3 +- .../org/apache/solr/util/SimplePostTool.java | 3 +- .../java/org/apache/solr/util/SolrCLI.java | 3 +- .../org/apache/solr/util/SolrLogLayout.java | 33 ++++--- .../org/apache/solr/util/SolrPluginUtils.java | 1 - .../org/apache/solr/util/SpatialUtils.java | 3 +- .../apache/solr/util/SystemIdResolver.java | 3 +- .../org/apache/solr/util/TestInjection.java | 3 +- .../java/org/apache/solr/util/TimeOut.java | 3 +- .../org/apache/solr/util/TimeZoneUtils.java | 1 - .../org/apache/solr/util/VersionedFile.java | 1 - .../BigEndianAscendingWordDeserializer.java | 3 +- .../hll/BigEndianAscendingWordSerializer.java | 3 +- .../org/apache/solr/util/hll/BitUtil.java | 3 +- .../org/apache/solr/util/hll/BitVector.java | 3 +- .../java/org/apache/solr/util/hll/HLL.java | 3 +- .../org/apache/solr/util/hll/HLLMetadata.java | 3 +- .../org/apache/solr/util/hll/HLLType.java | 3 +- .../org/apache/solr/util/hll/HLLUtil.java | 3 +- .../apache/solr/util/hll/IHLLMetadata.java | 3 +- .../apache/solr/util/hll/ISchemaVersion.java | 3 +- .../solr/util/hll/IWordDeserializer.java | 3 +- .../apache/solr/util/hll/IWordSerializer.java | 3 +- .../apache/solr/util/hll/LongIterator.java | 3 +- .../org/apache/solr/util/hll/NumberUtil.java | 3 +- .../solr/util/hll/SchemaVersionOne.java | 3 +- .../solr/util/hll/SerializationUtil.java | 3 +- .../apache/solr/util/hll/package-info.java | 1 - .../org/apache/solr/util/package-info.java | 1 - .../util/plugin/AbstractPluginLoader.java | 1 - .../util/plugin/MapInitializedPlugin.java | 1 - .../solr/util/plugin/MapPluginLoader.java | 1 - .../plugin/NamedListInitializedPlugin.java | 1 - .../util/plugin/NamedListPluginLoader.java | 1 - .../solr/util/plugin/SolrCoreAware.java | 1 - .../apache/solr/util/plugin/package-info.java | 1 - .../org/apache/solr/util/stats/Clock.java | 1 - .../java/org/apache/solr/util/stats/EWMA.java | 1 - .../stats/ExponentiallyDecayingSample.java | 1 - .../org/apache/solr/util/stats/Histogram.java | 1 - .../org/apache/solr/util/stats/Meter.java | 1 - .../org/apache/solr/util/stats/Sample.java | 1 - .../org/apache/solr/util/stats/Snapshot.java | 1 - .../org/apache/solr/util/stats/Timer.java | 1 - .../apache/solr/util/stats/TimerContext.java | 1 - .../apache/solr/util/stats/UniformSample.java | 1 - .../apache/solr/util/stats/package-info.java | 1 - .../solr/util/xslt/TransformerProvider.java | 1 - .../apache/solr/util/xslt/package-info.java | 1 - .../runtimecode/RuntimeLibReqHandler.java | 4 +- .../runtimecode/RuntimeLibResponseWriter.java | 18 +++- .../RuntimeLibSearchComponent.java | 4 +- .../solr/AnalysisAfterCoreReloadTest.java | 3 +- .../apache/solr/BasicFunctionalityTest.java | 1 - .../org/apache/solr/ConvertedLegacyTest.java | 1 - .../org/apache/solr/CursorPagingTest.java | 1 - .../apache/solr/DisMaxRequestHandlerTest.java | 1 - .../solr/DistributedIntervalFacetingTest.java | 28 +++--- .../test/org/apache/solr/EchoParamsTest.java | 1 - .../org/apache/solr/MinimalSchemaTest.java | 1 - .../org/apache/solr/OutputWriterTest.java | 1 - .../src/test/org/apache/solr/SampleTest.java | 1 - .../org/apache/solr/SolrTestCaseJ4Test.java | 3 +- .../org/apache/solr/TestCrossCoreJoin.java | 1 - .../solr/TestCursorMarkWithoutUniqueKey.java | 1 - .../apache/solr/TestDistributedGrouping.java | 3 +- .../solr/TestDistributedMissingSort.java | 1 - .../apache/solr/TestDistributedSearch.java | 1 - .../org/apache/solr/TestDocumentBuilder.java | 4 +- .../org/apache/solr/TestGroupingSearch.java | 1 - .../solr/TestHighlightDedupGrouping.java | 1 - .../src/test/org/apache/solr/TestJoin.java | 1 - .../org/apache/solr/TestRandomDVFaceting.java | 1 - .../org/apache/solr/TestRandomFaceting.java | 1 - .../solr/TestSimpleTrackingShardHandler.java | 1 - .../org/apache/solr/TestTolerantSearch.java | 33 ++++--- .../PathHierarchyTokenizerFactoryTest.java | 1 - .../apache/solr/analysis/TestCharFilters.java | 3 +- .../TestReversedWildcardFilterFactory.java | 3 +- .../TestWordDelimiterFilterFactory.java | 3 +- .../ThrowingMockTokenFilterFactory.java | 3 +- .../client/solrj/ConnectionReuseTest.java | 3 +- .../TestEmbeddedSolrServerConstructors.java | 3 +- .../solrj/embedded/TestJettySolrRunner.java | 3 +- .../apache/solr/cloud/ActionThrottleTest.java | 3 +- .../solr/cloud/AliasIntegrationTest.java | 3 +- .../org/apache/solr/cloud/AssignTest.java | 3 +- .../AsyncCallRequestStatusResponseTest.java | 3 +- .../solr/cloud/AsyncMigrateRouteKeyTest.java | 3 +- .../solr/cloud/BaseCdcrDistributedZkTest.java | 3 +- .../solr/cloud/BasicDistributedZk2Test.java | 3 +- .../solr/cloud/BasicDistributedZkTest.java | 3 +- .../org/apache/solr/cloud/BasicZkTest.java | 3 +- .../CdcrReplicationDistributedZkTest.java | 3 +- .../cloud/CdcrReplicationHandlerTest.java | 3 +- .../solr/cloud/CdcrRequestHandlerTest.java | 3 +- .../cloud/CdcrVersionReplicationTest.java | 3 +- .../cloud/ChaosMonkeyNothingIsSafeTest.java | 3 +- .../solr/cloud/ChaosMonkeySafeLeaderTest.java | 3 +- .../solr/cloud/ChaosMonkeyShardSplitTest.java | 3 +- .../solr/cloud/CleanupOldIndexTest.java | 3 +- .../CloudExitableDirectoryReaderTest.java | 34 ++++--- .../apache/solr/cloud/ClusterStateTest.java | 27 +++--- .../solr/cloud/ClusterStateUpdateTest.java | 3 +- .../solr/cloud/CollectionReloadTest.java | 3 +- .../cloud/CollectionStateFormat2Test.java | 3 +- .../cloud/CollectionTooManyReplicasTest.java | 3 +- .../CollectionsAPIAsyncDistributedZkTest.java | 3 +- .../CollectionsAPIDistributedZkTest.java | 3 +- .../solr/cloud/CollectionsAPISolrJTests.java | 3 +- ...ncurrentDeleteAndCreateCollectionTest.java | 3 +- .../apache/solr/cloud/ConfigSetsAPITest.java | 3 +- .../solr/cloud/ConnectionManagerTest.java | 27 +++--- .../solr/cloud/CustomCollectionTest.java | 3 +- .../solr/cloud/DeleteInactiveReplicaTest.java | 3 +- .../DeleteLastCustomShardedReplicaTest.java | 3 +- .../apache/solr/cloud/DeleteReplicaTest.java | 3 +- .../apache/solr/cloud/DeleteShardTest.java | 3 +- .../cloud/DistribJoinFromCollectionTest.java | 3 +- .../solr/cloud/DistributedQueueTest.java | 22 ++--- .../cloud/DistributedVersionInfoTest.java | 3 +- .../apache/solr/cloud/ForceLeaderTest.java | 3 +- .../cloud/FullSolrCloudDistribCmdsTest.java | 3 +- .../apache/solr/cloud/HttpPartitionTest.java | 3 +- .../apache/solr/cloud/KerberosTestUtil.java | 29 +++--- .../cloud/LeaderElectionIntegrationTest.java | 3 +- .../apache/solr/cloud/LeaderElectionTest.java | 28 +++--- .../LeaderFailoverAfterPartitionTest.java | 3 +- .../LeaderInitiatedRecoveryOnCommitTest.java | 3 +- ...erInitiatedRecoveryOnShardRestartTest.java | 3 +- .../solr/cloud/MigrateRouteKeyTest.java | 3 +- .../solr/cloud/MultiThreadedOCPTest.java | 3 +- ...OfBoxZkACLAndCredentialsProvidersTest.java | 33 ++++--- ...iddenZkACLAndCredentialsProvidersTest.java | 33 ++++--- ...rseerCollectionConfigSetProcessorTest.java | 3 +- .../apache/solr/cloud/OverseerRolesTest.java | 4 +- .../apache/solr/cloud/OverseerStatusTest.java | 3 +- .../solr/cloud/OverseerTaskQueueTest.java | 22 ++--- .../org/apache/solr/cloud/OverseerTest.java | 3 +- .../cloud/RecoveryAfterSoftCommitTest.java | 3 +- .../org/apache/solr/cloud/RecoveryZkTest.java | 3 +- .../solr/cloud/RemoteQueryErrorTest.java | 3 +- .../solr/cloud/ReplicaPropertiesBase.java | 3 +- .../solr/cloud/ReplicationFactorTest.java | 3 +- .../solr/cloud/RestartWhileUpdatingTest.java | 3 +- .../apache/solr/cloud/RollingRestartTest.java | 3 +- .../apache/solr/cloud/SSLMigrationTest.java | 3 +- .../solr/cloud/SaslZkACLProviderTest.java | 33 ++++--- .../solr/cloud/ShardRoutingCustomTest.java | 3 +- .../apache/solr/cloud/ShardRoutingTest.java | 3 +- .../org/apache/solr/cloud/ShardSplitTest.java | 3 +- .../SharedFSAutoReplicaFailoverTest.java | 3 +- .../SharedFSAutoReplicaFailoverUtilsTest.java | 3 +- .../SimpleCollectionCreateDeleteTest.java | 3 +- .../org/apache/solr/cloud/SliceStateTest.java | 27 +++--- .../solr/cloud/SolrCloudExampleTest.java | 3 +- .../apache/solr/cloud/SolrXmlInZkTest.java | 22 ++--- .../org/apache/solr/cloud/SyncSliceTest.java | 3 +- .../cloud/TestAuthenticationFramework.java | 3 +- .../solr/cloud/TestCloudInspectUtil.java | 7 +- .../apache/solr/cloud/TestCollectionAPI.java | 4 +- .../apache/solr/cloud/TestConfigSetsAPI.java | 1 - .../cloud/TestConfigSetsAPIExclusivity.java | 1 - .../cloud/TestConfigSetsAPIZkFailure.java | 1 - .../org/apache/solr/cloud/TestCryptoKeys.java | 3 +- .../cloud/TestDistribDocBasedVersion.java | 3 +- .../cloud/TestDownShardTolerantSearch.java | 3 +- .../TestExclusionRuleCollectionAccess.java | 3 +- .../solr/cloud/TestHashPartitioner.java | 27 +++--- .../cloud/TestLeaderElectionZkExpiry.java | 3 +- .../TestLeaderInitiatedRecoveryThread.java | 31 ++++--- .../solr/cloud/TestMiniSolrCloudCluster.java | 3 +- .../cloud/TestMiniSolrCloudClusterBase.java | 4 +- .../TestMiniSolrCloudClusterKerberos.java | 3 +- .../cloud/TestMiniSolrCloudClusterSSL.java | 3 +- .../cloud/TestRandomRequestDistribution.java | 3 +- .../solr/cloud/TestRebalanceLeaders.java | 3 +- .../solr/cloud/TestReplicaProperties.java | 4 +- .../solr/cloud/TestRequestForwarding.java | 3 +- .../cloud/TestRequestStatusCollectionAPI.java | 3 +- .../cloud/TestShortCircuitedRequests.java | 3 +- .../cloud/TestSolrCloudWithKerberosAlt.java | 3 +- .../org/apache/solr/cloud/TestZkChroot.java | 3 +- .../cloud/TriLevelCompositeIdRoutingTest.java | 3 +- .../solr/cloud/UnloadDistributedZkTest.java | 3 +- ...aramsZkACLAndCredentialsProvidersTest.java | 33 ++++--- .../test/org/apache/solr/cloud/ZkCLITest.java | 3 +- .../apache/solr/cloud/ZkControllerTest.java | 28 +++--- .../apache/solr/cloud/ZkNodePropsTest.java | 27 +++--- .../apache/solr/cloud/ZkSolrClientTest.java | 27 +++--- .../hdfs/HdfsBasicDistributedZk2Test.java | 3 +- .../hdfs/HdfsBasicDistributedZkTest.java | 3 +- .../HdfsChaosMonkeyNothingIsSafeTest.java | 3 +- .../hdfs/HdfsChaosMonkeySafeLeaderTest.java | 3 +- .../HdfsCollectionsAPIDistributedZkTest.java | 3 +- .../solr/cloud/hdfs/HdfsNNFailoverTest.java | 1 - .../solr/cloud/hdfs/HdfsRecoverLeaseTest.java | 3 +- .../solr/cloud/hdfs/HdfsRecoveryZkTest.java | 3 +- .../hdfs/HdfsRestartWhileUpdatingTest.java | 3 +- .../solr/cloud/hdfs/HdfsSyncSliceTest.java | 3 +- .../apache/solr/cloud/hdfs/HdfsTestUtil.java | 33 ++++--- .../solr/cloud/hdfs/HdfsThreadLeakTest.java | 3 +- .../hdfs/HdfsUnloadDistributedZkTest.java | 3 +- .../HdfsWriteToMultipleCollectionsTest.java | 1 - .../solr/cloud/hdfs/StressHdfsTest.java | 1 - .../overseer/TestClusterStateMutator.java | 3 +- .../cloud/overseer/ZkStateReaderTest.java | 3 +- .../cloud/overseer/ZkStateWriterTest.java | 3 +- .../solr/cloud/rule/RuleEngineTest.java | 3 +- .../org/apache/solr/cloud/rule/RulesTest.java | 7 +- .../core/BlobStoreTestRequestHandler.java | 4 +- .../core/CachingDirectoryFactoryTest.java | 33 ++++--- .../core/CountUsageValueSourceParser.java | 3 +- .../solr/core/DirectoryFactoryTest.java | 1 - .../solr/core/DummyValueSourceParser.java | 3 +- .../core/ExitableDirectoryReaderTest.java | 4 +- .../solr/core/HdfsDirectoryFactoryTest.java | 1 - .../org/apache/solr/core/MockInfoMBean.java | 13 ++- .../solr/core/MockShardHandlerFactory.java | 3 +- .../solr/core/OpenCloseCoreStressTest.java | 1 - .../org/apache/solr/core/PluginInfoTest.java | 3 +- .../apache/solr/core/QueryResultKeyTest.java | 1 - .../solr/core/RAMDirectoryFactoryTest.java | 1 - .../apache/solr/core/RequestHandlersTest.java | 1 - .../apache/solr/core/ResourceLoaderTest.java | 1 - .../org/apache/solr/core/SOLR749Test.java | 3 +- .../core/SolrCoreCheckLockOnStartupTest.java | 3 +- .../org/apache/solr/core/SolrCoreTest.java | 1 - .../org/apache/solr/core/TestBadConfig.java | 1 - .../apache/solr/core/TestCodecSupport.java | 3 +- .../test/org/apache/solr/core/TestConfig.java | 1 - .../apache/solr/core/TestConfigOverlay.java | 3 +- .../solr/core/TestConfigSetImmutable.java | 3 +- .../solr/core/TestConfigSetProperties.java | 3 +- .../org/apache/solr/core/TestConfigSets.java | 3 +- .../apache/solr/core/TestCoreContainer.java | 1 - .../apache/solr/core/TestCoreDiscovery.java | 3 +- .../apache/solr/core/TestDynamicLoading.java | 4 +- .../solr/core/TestImplicitCoreProperties.java | 32 +++---- .../solr/core/TestInfoStreamLogging.java | 3 +- .../org/apache/solr/core/TestInitParams.java | 3 +- .../org/apache/solr/core/TestLazyCores.java | 3 +- .../solr/core/TestMergePolicyConfig.java | 3 +- .../org/apache/solr/core/TestNRTOpen.java | 3 +- .../solr/core/TestQuerySenderListener.java | 1 - .../solr/core/TestQuerySenderNoQuery.java | 3 +- .../solr/core/TestReloadAndDeleteDocs.java | 1 - .../solr/core/TestShardHandlerFactory.java | 1 - .../solr/core/TestSolrConfigHandler.java | 4 +- .../apache/solr/core/TestSolrIndexConfig.java | 3 +- .../org/apache/solr/core/TestSolrXml.java | 3 +- .../apache/solr/core/TestXIncludeConfig.java | 3 +- .../AnalysisRequestHandlerTestBase.java | 1 - .../solr/handler/CSVRequestHandlerTest.java | 1 - .../solr/handler/CheckBackupStatus.java | 3 +- .../DocumentAnalysisRequestHandlerTest.java | 1 - .../FieldAnalysisRequestHandlerTest.java | 1 - .../apache/solr/handler/JsonLoaderTest.java | 1 - .../solr/handler/MoreLikeThisHandlerTest.java | 1 - .../solr/handler/PingRequestHandlerTest.java | 1 - .../solr/handler/RequestLoggingTest.java | 3 +- .../handler/StandardRequestHandlerTest.java | 1 - .../apache/solr/handler/TestBlobHandler.java | 3 +- .../apache/solr/handler/TestCSVLoader.java | 1 - .../apache/solr/handler/TestConfigReload.java | 3 +- .../handler/TestReplicationHandlerBackup.java | 3 +- .../apache/solr/handler/TestReqParamsAPI.java | 33 ++++--- .../apache/solr/handler/TestRestoreCore.java | 4 +- .../apache/solr/handler/TestSQLHandler.java | 3 +- .../handler/TestSolrConfigHandlerCloud.java | 4 +- .../TestSolrConfigHandlerConcurrent.java | 3 +- .../ThrowErrorOnInitRequestHandler.java | 1 - .../admin/CoreAdminCreateDiscoverTest.java | 1 - .../handler/admin/CoreAdminHandlerTest.java | 1 - .../admin/CoreAdminRequestStatusTest.java | 3 +- .../CoreMergeIndexesAdminHandlerTest.java | 3 +- .../solr/handler/admin/InfoHandlerTest.java | 1 - .../handler/admin/LoggingHandlerTest.java | 1 - .../handler/admin/LukeRequestHandlerTest.java | 1 - .../solr/handler/admin/MBeansHandlerTest.java | 1 - .../admin/SecurityConfHandlerTest.java | 4 +- .../admin/SegmentsInfoRequestHandlerTest.java | 3 +- .../admin/ShowFileRequestHandlerTest.java | 3 +- .../handler/admin/SystemInfoHandlerTest.java | 1 - .../handler/component/BadComponentTest.java | 5 +- .../handler/component/DebugComponentTest.java | 3 +- .../DistributedDebugComponentTest.java | 33 ++++--- .../DistributedExpandComponentTest.java | 3 +- .../DistributedFacetPivotLargeTest.java | 3 +- .../DistributedFacetPivotLongTailTest.java | 3 +- ...istributedFacetPivotSmallAdvancedTest.java | 3 +- .../DistributedFacetPivotSmallTest.java | 3 +- .../DistributedFacetPivotWhiteBoxTest.java | 3 +- .../DistributedMLTComponentTest.java | 3 +- ...stributedQueryComponentCustomSortTest.java | 3 +- ...ributedQueryComponentOptimizationTest.java | 3 +- ...istributedQueryElevationComponentTest.java | 3 +- .../DistributedSpellCheckComponentTest.java | 3 +- .../DistributedSuggestComponentTest.java | 3 +- .../DistributedTermsComponentTest.java | 3 +- .../DummyCustomParamSpellChecker.java | 26 +++--- .../component/FacetPivotSmallTest.java | 3 +- .../QueryElevationComponentTest.java | 1 - .../component/ResponseLogComponentTest.java | 17 ++-- .../handler/component/SearchHandlerTest.java | 1 - .../component/SpatialHeatmapFacetsTest.java | 3 +- .../component/SpellCheckComponentTest.java | 1 - .../handler/component/StatsComponentTest.java | 3 +- ...uggestComponentContextFilterQueryTest.java | 3 +- .../component/SuggestComponentTest.java | 3 +- .../TermVectorComponentDistributedTest.java | 1 - .../component/TermVectorComponentTest.java | 18 ++-- .../handler/component/TermsComponentTest.java | 3 +- ...tDistributedStatsComponentCardinality.java | 7 +- .../component/TestExpandComponent.java | 31 ++++--- .../component/TestPivotHelperCode.java | 5 +- .../TestTrackingShardHandlerFactory.java | 3 +- .../handler/loader/JavabinLoaderTest.java | 3 +- .../highlight/FastVectorHighlighterTest.java | 1 - .../highlight/HighlighterMaxOffsetTest.java | 3 +- .../solr/highlight/HighlighterTest.java | 1 - .../TestPostingsSolrHighlighter.java | 3 +- .../solr/index/hdfs/CheckHdfsIndexTest.java | 3 +- .../solr/internal/csv/CSVParserTest.java | 6 +- .../solr/internal/csv/CSVPrinterTest.java | 6 +- .../solr/internal/csv/CSVStrategyTest.java | 6 +- .../solr/internal/csv/CSVUtilsTest.java | 6 +- .../solr/internal/csv/CharBufferTest.java | 26 +++--- .../csv/ExtendedBufferedReaderTest.java | 6 +- .../csv/writer/CSVConfigGuesserTest.java | 26 +++--- .../internal/csv/writer/CSVConfigTest.java | 26 +++--- .../internal/csv/writer/CSVFieldTest.java | 26 +++--- .../internal/csv/writer/CSVWriterTest.java | 26 +++--- .../apache/solr/logging/TestLogWatcher.java | 3 +- .../apache/solr/request/JSONWriterTest.java | 1 - .../apache/solr/request/SimpleFacetsTest.java | 1 - .../apache/solr/request/SmileWriterTest.java | 4 +- .../org/apache/solr/request/TestFaceting.java | 1 - .../solr/request/TestIntervalFaceting.java | 1 - .../solr/request/TestRemoteStreaming.java | 3 +- .../apache/solr/request/TestWriterPerf.java | 1 - .../apache/solr/request/macro/TestMacros.java | 4 +- .../solr/response/TestCSVResponseWriter.java | 1 - .../response/TestChildDocTransformer.java | 3 +- .../response/TestCustomDocTransformer.java | 3 +- .../TestPHPSerializedResponseWriter.java | 1 - .../solr/response/TestRawResponseWriter.java | 1 - .../solr/response/TestRawTransformer.java | 3 +- .../solr/response/TestSolrQueryResponse.java | 3 +- .../response/TestSortingResponseWriter.java | 1 - .../apache/solr/rest/SolrRestletTestBase.java | 3 +- .../apache/solr/rest/TestManagedResource.java | 3 +- .../solr/rest/TestManagedResourceStorage.java | 3 +- .../org/apache/solr/rest/TestRestManager.java | 3 +- .../solr/rest/schema/TestBulkSchemaAPI.java | 3 +- .../rest/schema/TestClassNameShortening.java | 3 +- .../TestCopyFieldCollectionResource.java | 3 +- .../TestDefaultSearchFieldResource.java | 3 +- .../TestDynamicFieldCollectionResource.java | 3 +- .../rest/schema/TestDynamicFieldResource.java | 3 +- .../schema/TestFieldCollectionResource.java | 3 +- .../solr/rest/schema/TestFieldResource.java | 3 +- .../TestFieldTypeCollectionResource.java | 3 +- .../rest/schema/TestFieldTypeResource.java | 4 +- ...TestManagedSchemaDynamicFieldResource.java | 3 +- .../TestManagedSchemaFieldResource.java | 3 +- .../TestManagedSchemaFieldTypeResource.java | 3 +- .../TestRemoveLastDynamicCopyField.java | 4 +- .../rest/schema/TestSchemaNameResource.java | 3 +- .../solr/rest/schema/TestSchemaResource.java | 4 +- .../schema/TestSchemaSimilarityResource.java | 3 +- .../schema/TestSchemaVersionResource.java | 3 +- .../TestSerializedLuceneMatchVersion.java | 3 +- ...olrQueryParserDefaultOperatorResource.java | 3 +- .../schema/TestSolrQueryParserResource.java | 3 +- .../schema/TestUniqueKeyFieldResource.java | 3 +- .../TestManagedStopFilterFactory.java | 3 +- .../TestManagedSynonymFilterFactory.java | 3 +- .../schema/AbstractCurrencyFieldTest.java | 3 +- .../apache/solr/schema/BadCopyFieldTest.java | 1 - .../solr/schema/BadIndexSchemaTest.java | 1 - .../solr/schema/ChangedSchemaMergeTest.java | 1 - .../org/apache/solr/schema/CopyFieldTest.java | 1 - .../schema/CurrencyFieldOpenExchangeTest.java | 3 +- .../solr/schema/CurrencyFieldXmlFileTest.java | 3 +- .../solr/schema/CustomAnalyzerStrField.java | 3 +- .../org/apache/solr/schema/DateFieldTest.java | 1 - .../solr/schema/DateRangeFieldTest.java | 5 +- .../solr/schema/DocValuesMissingTest.java | 3 +- .../solr/schema/DocValuesMultiTest.java | 3 +- .../org/apache/solr/schema/DocValuesTest.java | 3 +- .../org/apache/solr/schema/EnumFieldTest.java | 3 +- .../schema/ExternalFileFieldSortTest.java | 19 ++-- .../schema/IndexSchemaRuntimeFieldTest.java | 3 +- .../apache/solr/schema/IndexSchemaTest.java | 1 - .../solr/schema/MockExchangeRateProvider.java | 3 +- .../org/apache/solr/schema/MultiTermTest.java | 3 +- .../solr/schema/MyCrazyCustomField.java | 3 +- .../solr/schema/NotRequiredUniqueKeyTest.java | 1 - .../apache/solr/schema/NumericFieldsTest.java | 1 - .../OpenExchangeRatesOrgProviderTest.java | 3 +- .../org/apache/solr/schema/PolyFieldTest.java | 3 +- .../solr/schema/PreAnalyzedFieldTest.java | 3 +- .../solr/schema/PrimitiveFieldTypeTest.java | 1 - .../solr/schema/RequiredFieldsTest.java | 1 - .../SchemaVersionSpecificBehaviorTest.java | 1 - .../solr/schema/SortableBinaryField.java | 3 +- .../solr/schema/SpatialRPTFieldTypeTest.java | 3 +- .../solr/schema/SynonymTokenizerTest.java | 3 +- .../apache/solr/schema/TestBinaryField.java | 1 - .../solr/schema/TestBulkSchemaConcurrent.java | 4 +- .../solr/schema/TestCloudManagedSchema.java | 3 +- .../TestCloudManagedSchemaConcurrent.java | 3 +- .../solr/schema/TestCloudSchemaless.java | 3 +- .../solr/schema/TestCollationField.java | 1 - .../schema/TestCollationFieldDocValues.java | 1 - .../apache/solr/schema/TestManagedSchema.java | 3 +- .../apache/solr/schema/TestOmitPositions.java | 3 +- .../apache/solr/schema/TestSchemaManager.java | 3 +- .../solr/schema/TestUseDocValuesAsStored.java | 3 +- .../schema/TestUseDocValuesAsStored2.java | 3 +- .../schema/ThrowErrorOnInitFieldType.java | 3 +- ...rieIntPrefixActsAsRangeQueryFieldType.java | 3 +- .../apache/solr/schema/WrappedIntField.java | 3 +- .../search/AnalyticsMergeStrategyTest.java | 3 +- .../solr/search/AnalyticsQueryTest.java | 1 - .../apache/solr/search/CursorMarkTest.java | 1 - .../solr/search/DelayingSearchComponent.java | 3 +- .../org/apache/solr/search/DocSetPerf.java | 1 - .../apache/solr/search/FooQParserPlugin.java | 1 - .../apache/solr/search/MergeStrategyTest.java | 3 +- .../solr/search/MockSearchComponent.java | 3 +- .../apache/solr/search/QueryEqualityTest.java | 3 +- .../apache/solr/search/QueryParsingTest.java | 3 +- .../org/apache/solr/search/RankQueryTest.java | 1 - .../apache/solr/search/ReturnFieldsTest.java | 1 - .../solr/search/SortSpecParsingTest.java | 3 +- .../apache/solr/search/SpatialFilterTest.java | 4 +- .../solr/search/TestAddFieldRealTimeGet.java | 3 +- .../search/TestAnalyticsQParserPlugin.java | 1 - .../search/TestCollapseQParserPlugin.java | 1 - .../TestComplexPhraseQParserPlugin.java | 3 +- .../solr/search/TestComponentsName.java | 3 +- .../apache/solr/search/TestCustomSort.java | 3 +- .../org/apache/solr/search/TestDocSet.java | 1 - .../search/TestElisionMultitermQuery.java | 11 ++- .../solr/search/TestExtendedDismaxParser.java | 1 - .../solr/search/TestFieldSortValues.java | 3 +- .../solr/search/TestFilteredDocIdSet.java | 3 +- .../org/apache/solr/search/TestFiltering.java | 1 - .../search/TestFoldingMultitermQuery.java | 3 +- .../solr/search/TestHashQParserPlugin.java | 1 - .../apache/solr/search/TestInitQParser.java | 3 +- .../org/apache/solr/search/TestLFUCache.java | 3 +- .../org/apache/solr/search/TestLRUCache.java | 3 +- .../solr/search/TestMaxScoreQueryParser.java | 3 +- .../apache/solr/search/TestMissingGroups.java | 1 - .../solr/search/TestNoOpRegenerator.java | 3 +- ...erriddenPrefixQueryForCustomFieldType.java | 3 +- .../solr/search/TestPseudoReturnFields.java | 1 - .../apache/solr/search/TestQueryUtils.java | 1 - .../solr/search/TestQueryWrapperFilter.java | 4 +- .../TestRandomCollapseQParserPlugin.java | 1 - .../solr/search/TestRankQueryPlugin.java | 1 - .../solr/search/TestReRankQParserPlugin.java | 1 - .../solr/search/TestReloadDeadlock.java | 5 +- .../apache/solr/search/TestSearchPerf.java | 1 - .../solr/search/TestSimpleQParserPlugin.java | 3 +- .../apache/solr/search/TestSmileRequest.java | 4 +- .../apache/solr/search/TestSolr4Spatial.java | 3 +- .../apache/solr/search/TestSolr4Spatial2.java | 3 +- .../org/apache/solr/search/TestSolrJ.java | 1 - .../test/org/apache/solr/search/TestSort.java | 1 - .../solr/search/TestStandardQParsers.java | 3 +- .../solr/search/TestStressUserVersions.java | 5 +- .../solr/search/TestSurroundQueryParser.java | 3 +- .../org/apache/solr/search/TestTrieFacet.java | 1 - .../solr/search/TestValueSourceCache.java | 3 +- .../apache/solr/search/TestXmlQParser.java | 5 +- .../solr/search/facet/TestJsonFacets.java | 3 +- .../search/function/NvlValueSourceParser.java | 1 - .../search/function/SortByFunctionTest.java | 3 +- .../search/function/TestFunctionQuery.java | 1 - .../TestMinMaxOnMultiValuedField.java | 1 - .../solr/search/function/TestOrdValues.java | 3 +- .../function/TestSortByMinMaxFunction.java | 3 +- .../distance/DistanceFunctionTest.java | 3 +- .../solr/search/join/BJQParserTest.java | 1 - .../join/BlockJoinFacetDistribTest.java | 3 +- .../search/join/BlockJoinFacetRandomTest.java | 3 +- .../search/join/BlockJoinFacetSimpleTest.java | 3 +- .../solr/search/join/GraphQueryTest.java | 3 +- .../search/join/TestScoreJoinQPNoScore.java | 1 - .../search/join/TestScoreJoinQPScore.java | 1 - .../solr/search/json/TestJsonRequest.java | 3 +- .../solr/search/mlt/CloudMLTQParserTest.java | 3 +- .../solr/search/mlt/SimpleMLTQParserTest.java | 3 +- .../similarities/BaseSimilarityTestCase.java | 3 +- .../TestBM25SimilarityFactory.java | 3 +- .../TestClassicSimilarityFactory.java | 3 +- .../TestDFISimilarityFactory.java | 3 +- .../TestDFRSimilarityFactory.java | 3 +- .../similarities/TestIBSimilarityFactory.java | 3 +- .../TestLMDirichletSimilarityFactory.java | 3 +- .../TestLMJelinekMercerSimilarityFactory.java | 3 +- .../TestNonDefinedSimilarityFactory.java | 3 +- .../similarities/TestPerFieldSimilarity.java | 3 +- .../TestPerFieldSimilarityClassic.java | 3 +- ...PerFieldSimilarityWithDefaultOverride.java | 3 +- .../TestSweetSpotSimilarityFactory.java | 3 +- .../solr/search/stats/TestBaseStatsCache.java | 3 +- .../search/stats/TestDefaultStatsCache.java | 3 +- .../solr/search/stats/TestDistribIDF.java | 3 +- .../stats/TestExactSharedStatsCache.java | 4 +- .../search/stats/TestExactStatsCache.java | 4 +- .../solr/search/stats/TestLRUStatsCache.java | 4 +- .../security/BasicAuthIntegrationTest.java | 4 +- .../security/MockAuthenticationPlugin.java | 4 +- .../security/MockAuthorizationPlugin.java | 3 +- .../PKIAuthenticationIntegrationTest.java | 4 +- .../security/TestAuthorizationFramework.java | 7 +- .../security/TestPKIAuthenticationPlugin.java | 3 +- .../TestRuleBasedAuthorizationPlugin.java | 3 +- .../TestSha256AuthenticationProvider.java | 3 +- .../servlet/DirectSolrConnectionTest.java | 1 - .../solr/servlet/ResponseHeaderTest.java | 3 +- .../solr/servlet/SolrRequestParserTest.java | 1 - .../ConjunctionSolrSpellCheckerTest.java | 23 +++-- .../spelling/DirectSolrSpellCheckerTest.java | 3 +- .../spelling/FileBasedSpellCheckerTest.java | 1 - .../solr/spelling/SampleComparator.java | 3 +- .../solr/spelling/SpellCheckCollatorTest.java | 3 +- .../SpellPossibilityIteratorTest.java | 3 +- .../spelling/SpellingQueryConverterTest.java | 1 - .../TestSuggestSpellingConverter.java | 3 +- .../WordBreakSolrSpellCheckerTest.java | 3 +- .../spelling/suggest/SuggesterFSTTest.java | 3 +- .../spelling/suggest/SuggesterTSTTest.java | 3 +- .../solr/spelling/suggest/SuggesterTest.java | 1 - .../spelling/suggest/SuggesterWFSTTest.java | 3 +- .../suggest/TestAnalyzeInfixSuggestions.java | 11 ++- .../suggest/TestAnalyzedSuggestions.java | 3 +- .../suggest/TestBlendedInfixSuggestions.java | 3 +- .../suggest/TestFileDictionaryLookup.java | 3 +- .../suggest/TestFreeTextSuggestions.java | 3 +- .../suggest/TestFuzzyAnalyzedSuggestions.java | 11 ++- .../TestHighFrequencyDictionaryFactory.java | 3 +- .../suggest/TestPhraseSuggestions.java | 3 +- .../solr/store/blockcache/BlockCacheTest.java | 3 +- .../store/blockcache/BlockDirectoryTest.java | 3 +- .../store/blockcache/BufferStoreTest.java | 3 +- .../solr/store/hdfs/HdfsDirectoryTest.java | 3 +- .../solr/store/hdfs/HdfsLockFactoryTest.java | 3 +- .../solr/update/AddBlockUpdateTest.java | 25 +++--- .../update/AnalysisErrorHandlingTest.java | 3 +- .../apache/solr/update/AutoCommitTest.java | 1 - .../apache/solr/update/CdcrUpdateLogTest.java | 3 +- .../solr/update/DataDrivenBlockJoinTest.java | 23 +++-- .../DirectUpdateHandlerOptimizeTest.java | 3 +- .../solr/update/DirectUpdateHandlerTest.java | 1 - .../solr/update/DocumentBuilderTest.java | 1 - .../apache/solr/update/DummyMergePolicy.java | 3 +- .../solr/update/HardAutoCommitTest.java | 1 - .../solr/update/MockStreamingSolrClients.java | 3 +- .../org/apache/solr/update/PeerSyncTest.java | 3 +- .../solr/update/SoftAutoCommitTest.java | 1 - .../solr/update/SolrCmdDistributorTest.java | 3 +- .../solr/update/SolrIndexConfigTest.java | 3 +- .../solr/update/SolrIndexSplitterTest.java | 3 +- .../TestDocBasedVersionConstraints.java | 1 - .../solr/update/TestExceedMaxTermLength.java | 3 +- .../apache/solr/update/TestHdfsUpdateLog.java | 3 +- .../solr/update/TestIndexingPerformance.java | 1 - .../apache/solr/update/UpdateParamsTest.java | 1 - .../apache/solr/update/VersionInfoTest.java | 3 +- ...chemaFieldsUpdateProcessorFactoryTest.java | 1 - .../update/processor/AtomicUpdatesTest.java | 31 ++++--- .../CloneFieldUpdateProcessorFactoryTest.java | 1 - .../CustomUpdateRequestProcessor.java | 1 - .../CustomUpdateRequestProcessorFactory.java | 1 - .../DefaultValueUpdateProcessorTest.java | 1 - ...cExpirationUpdateProcessorFactoryTest.java | 1 - .../FieldMutatingUpdateProcessorTest.java | 1 - ...mitOptimizeUpdateProcessorFactoryTest.java | 3 +- .../ParsingFieldUpdateProcessorsTest.java | 1 - .../PreAnalyzedUpdateProcessorTest.java | 13 ++- .../RecordingUpdateProcessorFactory.java | 1 - .../solr/update/processor/RuntimeUrp.java | 3 +- .../update/processor/ScriptEngineTest.java | 1 - .../SignatureUpdateProcessorFactoryTest.java | 1 - ...elessScriptUpdateProcessorFactoryTest.java | 3 +- .../processor/TestNamedUpdateProcessors.java | 4 +- .../TestPartialUpdateDeduplication.java | 3 +- .../UUIDUpdateProcessorFallbackTest.java | 3 +- .../UniqFieldsUpdateProcessorFactoryTest.java | 1 - .../processor/UpdateProcessorTestBase.java | 3 +- .../UpdateRequestProcessorFactoryTest.java | 1 - .../test/org/apache/solr/util/BitSetPerf.java | 1 - .../apache/solr/util/CircularListTest.java | 1 - .../org/apache/solr/util/DOMUtilTest.java | 3 +- .../apache/solr/util/DateMathParserTest.java | 1 - .../apache/solr/util/DistanceUnitsTest.java | 9 +- .../org/apache/solr/util/FileUtilsTest.java | 3 +- .../apache/solr/util/MockCoreContainer.java | 3 +- .../org/apache/solr/util/PrimUtilsTest.java | 14 +-- .../apache/solr/util/SimplePostToolTest.java | 3 +- .../apache/solr/util/SolrPluginUtilsTest.java | 1 - .../solr/util/TestFastOutputStream.java | 1 - .../org/apache/solr/util/TestFastWriter.java | 1 - .../solr/util/TestObjectReleaseTracker.java | 3 +- .../org/apache/solr/util/TestRTimerTree.java | 3 +- .../solr/util/TestSolrCLIRunExample.java | 3 +- .../solr/util/TestSystemIdResolver.java | 3 +- .../apache/solr/util/TestTestInjection.java | 3 +- .../test/org/apache/solr/util/TestUtils.java | 1 - .../apache/solr/util/TimeZoneUtilsTest.java | 1 - ...igEndianAscendingWordDeserializerTest.java | 1 - .../BigEndianAscendingWordSerializerTest.java | 1 - .../apache/solr/util/hll/BitVectorTest.java | 1 - .../apache/solr/util/hll/ExplicitHLLTest.java | 1 - .../org/apache/solr/util/hll/FullHLLTest.java | 1 - .../solr/util/hll/HLLSerializationTest.java | 1 - .../org/apache/solr/util/hll/HLLUtilTest.java | 1 - .../util/hll/IntegrationTestGenerator.java | 1 - .../solr/util/hll/ProbabilisticTestUtil.java | 1 - .../apache/solr/util/hll/SparseHLLTest.java | 1 - .../solr/client/solrj/ResponseParser.java | 1 - .../apache/solr/client/solrj/SolrClient.java | 1 - .../apache/solr/client/solrj/SolrQuery.java | 1 - .../apache/solr/client/solrj/SolrRequest.java | 1 - .../solr/client/solrj/SolrResponse.java | 1 - .../client/solrj/SolrServerException.java | 1 - .../solrj/StreamingResponseCallback.java | 1 - .../client/solrj/beans/BindingException.java | 3 +- .../solr/client/solrj/beans/package-info.java | 1 - .../client/solrj/impl/CloudSolrClient.java | 3 +- .../impl/ConcurrentUpdateSolrClient.java | 1 - .../solrj/impl/HttpClientConfigurer.java | 4 +- .../solrj/impl/InputStreamResponseParser.java | 3 +- .../solrj/impl/Krb5HttpClientConfigurer.java | 3 +- .../client/solrj/impl/NoOpResponseParser.java | 3 +- .../impl/SolrHttpRequestRetryHandler.java | 3 +- .../impl/SolrPortAwareCookieSpecFactory.java | 33 ++++--- .../client/solrj/impl/XMLResponseParser.java | 1 - .../solr/client/solrj/impl/package-info.java | 1 - .../solr/client/solrj/io/SolrClientCache.java | 3 +- .../apache/solr/client/solrj/io/Tuple.java | 1 - .../solrj/io/comp/ComparatorLambda.java | 11 ++- .../client/solrj/io/comp/ComparatorOrder.java | 7 +- .../client/solrj/io/comp/FieldComparator.java | 1 - .../solr/client/solrj/io/comp/HashKey.java | 3 +- .../io/comp/MultipleFieldComparator.java | 1 - .../solrj/io/comp/StreamComparator.java | 1 - .../client/solrj/io/comp/package-info.java | 3 - .../solr/client/solrj/io/eq/Equalitor.java | 5 +- .../client/solrj/io/eq/FieldEqualitor.java | 1 - .../solrj/io/eq/MultipleFieldEqualitor.java | 1 - .../client/solrj/io/eq/StreamEqualitor.java | 1 - .../solr/client/solrj/io/eq/package-info.java | 1 - .../client/solrj/io/ops/ConcatOperation.java | 23 +++-- .../solrj/io/ops/DistinctOperation.java | 33 ++++--- .../client/solrj/io/ops/GroupOperation.java | 33 ++++--- .../client/solrj/io/ops/ReduceOperation.java | 6 +- .../client/solrj/io/ops/ReplaceOperation.java | 21 +++-- .../io/ops/ReplaceWithFieldOperation.java | 23 +++-- .../io/ops/ReplaceWithValueOperation.java | 23 +++-- .../client/solrj/io/ops/StreamOperation.java | 19 ++-- .../client/solrj/io/ops/package-info.java | 1 - .../solr/client/solrj/io/package-info.java | 3 - .../client/solrj/io/sql/ConnectionImpl.java | 3 +- .../solrj/io/sql/DatabaseMetaDataImpl.java | 3 +- .../solr/client/solrj/io/sql/DriverImpl.java | 4 +- .../client/solrj/io/sql/ResultSetImpl.java | 3 +- .../solrj/io/sql/ResultSetMetaDataImpl.java | 3 +- .../client/solrj/io/sql/StatementImpl.java | 3 +- .../client/solrj/io/sql/package-info.java | 1 - .../client/solrj/io/stream/BiJoinStream.java | 1 - .../solrj/io/stream/CloudSolrStream.java | 1 - .../solrj/io/stream/ComplementStream.java | 1 - .../client/solrj/io/stream/DaemonStream.java | 2 - .../solrj/io/stream/ExceptionStream.java | 1 - .../client/solrj/io/stream/FacetStream.java | 3 +- .../solrj/io/stream/HashJoinStream.java | 1 - .../solrj/io/stream/InnerJoinStream.java | 1 - .../solrj/io/stream/IntersectStream.java | 1 - .../client/solrj/io/stream/JDBCStream.java | 1 - .../solrj/io/stream/JSONTupleStream.java | 33 ++++--- .../client/solrj/io/stream/JoinStream.java | 33 ++++--- .../solrj/io/stream/LeftOuterJoinStream.java | 1 - .../client/solrj/io/stream/MergeStream.java | 1 - .../solrj/io/stream/OuterHashJoinStream.java | 1 - .../solrj/io/stream/ParallelStream.java | 1 - .../solrj/io/stream/PushBackStream.java | 1 - .../client/solrj/io/stream/RankStream.java | 1 - .../client/solrj/io/stream/ReducerStream.java | 1 - .../client/solrj/io/stream/RollupStream.java | 2 - .../client/solrj/io/stream/SelectStream.java | 1 - .../client/solrj/io/stream/SolrStream.java | 1 - .../client/solrj/io/stream/StatsStream.java | 3 +- .../client/solrj/io/stream/StreamContext.java | 1 - .../client/solrj/io/stream/TupleStream.java | 1 - .../client/solrj/io/stream/UniqueStream.java | 1 - .../solrj/io/stream/expr/Expressible.java | 7 +- .../io/stream/expr/StreamExpression.java | 9 +- .../expr/StreamExpressionNamedParameter.java | 5 +- .../expr/StreamExpressionParameter.java | 3 +- .../stream/expr/StreamExpressionParser.java | 13 ++- .../io/stream/expr/StreamExpressionValue.java | 3 +- .../solrj/io/stream/expr/StreamFactory.java | 33 ++++--- .../solrj/io/stream/expr/package-info.java | 3 - .../solrj/io/stream/metrics/Bucket.java | 7 +- .../solrj/io/stream/metrics/CountMetric.java | 3 +- .../solrj/io/stream/metrics/MaxMetric.java | 3 +- .../solrj/io/stream/metrics/MeanMetric.java | 3 +- .../solrj/io/stream/metrics/Metric.java | 3 +- .../solrj/io/stream/metrics/MinMetric.java | 3 +- .../solrj/io/stream/metrics/SumMetric.java | 3 +- .../solrj/io/stream/metrics/package-info.java | 3 - .../client/solrj/io/stream/package-info.java | 3 - .../solr/client/solrj/package-info.java | 1 - .../solrj/request/AbstractUpdateRequest.java | 3 +- .../solrj/request/CollectionAdminRequest.java | 1 - .../solrj/request/ConfigSetAdminRequest.java | 1 - .../request/ContentStreamUpdateRequest.java | 4 +- .../solrj/request/CoreAdminRequest.java | 1 - .../solrj/request/DirectXmlRequest.java | 1 - .../request/DocumentAnalysisRequest.java | 1 - .../solrj/request/FieldAnalysisRequest.java | 1 - .../solrj/request/GenericSolrRequest.java | 3 +- .../client/solrj/request/IsUpdateRequest.java | 4 +- .../client/solrj/request/LukeRequest.java | 1 - .../client/solrj/request/QueryRequest.java | 1 - .../client/solrj/request/RequestWriter.java | 1 - .../solr/client/solrj/request/SolrPing.java | 1 - .../client/solrj/request/UpdateRequest.java | 1 - .../client/solrj/request/package-info.java | 1 - .../request/schema/AbstractSchemaRequest.java | 3 +- .../request/schema/AnalyzerDefinition.java | 3 +- .../request/schema/FieldTypeDefinition.java | 3 +- .../solrj/request/schema/SchemaRequest.java | 3 +- .../solrj/request/schema/package-info.java | 1 - .../solrj/response/AnalysisResponseBase.java | 1 - .../solr/client/solrj/response/Cluster.java | 3 +- .../solrj/response/ClusteringResponse.java | 3 +- .../response/CollectionAdminResponse.java | 1 - .../response/ConfigSetAdminResponse.java | 1 - .../solrj/response/CoreAdminResponse.java | 1 - .../response/DocumentAnalysisResponse.java | 1 - .../client/solrj/response/FacetField.java | 1 - .../solrj/response/FieldAnalysisResponse.java | 1 - .../solr/client/solrj/response/Group.java | 3 +- .../client/solrj/response/GroupCommand.java | 3 +- .../client/solrj/response/GroupResponse.java | 3 +- .../client/solrj/response/IntervalFacet.java | 8 +- .../client/solrj/response/LukeResponse.java | 1 - .../client/solrj/response/PivotField.java | 1 - .../client/solrj/response/QueryResponse.java | 1 - .../client/solrj/response/RangeFacet.java | 3 +- .../solrj/response/SimpleSolrResponse.java | 4 +- .../solrj/response/SolrPingResponse.java | 1 - .../solrj/response/SolrResponseBase.java | 1 - .../solrj/response/SpellCheckResponse.java | 3 +- .../solrj/response/SuggesterResponse.java | 3 +- .../client/solrj/response/Suggestion.java | 2 +- .../client/solrj/response/TermsResponse.java | 3 +- .../client/solrj/response/UpdateResponse.java | 1 - .../client/solrj/response/package-info.java | 1 - .../schema/FieldTypeRepresentation.java | 3 +- .../response/schema/SchemaRepresentation.java | 3 +- .../solrj/response/schema/SchemaResponse.java | 3 +- .../solrj/response/schema/package-info.java | 1 - .../solr/client/solrj/util/ClientUtils.java | 1 - .../solr/client/solrj/util/package-info.java | 1 - .../java/org/apache/solr/common/Callable.java | 3 +- .../solr/common/EmptyEntityResolver.java | 3 +- .../apache/solr/common/EnumFieldValue.java | 3 +- .../org/apache/solr/common/SolrDocument.java | 1 - .../apache/solr/common/SolrDocumentBase.java | 13 ++- .../apache/solr/common/SolrDocumentList.java | 1 - .../org/apache/solr/common/SolrException.java | 1 - .../apache/solr/common/SolrInputDocument.java | 1 - .../apache/solr/common/SolrInputField.java | 1 - .../org/apache/solr/common/StringUtils.java | 3 +- .../org/apache/solr/common/cloud/Aliases.java | 3 +- .../solr/common/cloud/BeforeReconnect.java | 27 +++--- .../solr/common/cloud/ClosableThread.java | 3 +- .../solr/common/cloud/ClusterState.java | 3 +- .../solr/common/cloud/ClusterStateUtil.java | 33 ++++--- .../solr/common/cloud/CompositeIdRouter.java | 3 +- .../solr/common/cloud/ConnectionManager.java | 7 +- .../cloud/DefaultConnectionStrategy.java | 27 +++--- .../common/cloud/DefaultZkACLProvider.java | 13 ++- .../cloud/DefaultZkCredentialsProvider.java | 9 +- .../solr/common/cloud/DocCollection.java | 3 +- .../apache/solr/common/cloud/DocRouter.java | 3 +- .../solr/common/cloud/HashBasedRouter.java | 3 +- .../solr/common/cloud/ImplicitDocRouter.java | 3 +- .../apache/solr/common/cloud/OnReconnect.java | 27 +++--- .../solr/common/cloud/PlainIdRouter.java | 5 +- .../org/apache/solr/common/cloud/Replica.java | 3 +- .../apache/solr/common/cloud/RoutingRule.java | 3 +- .../solr/common/cloud/SaslZkACLProvider.java | 3 +- .../org/apache/solr/common/cloud/Slice.java | 3 +- .../solr/common/cloud/SolrZkClient.java | 23 +++-- .../solr/common/cloud/SolrZooKeeper.java | 3 +- ...ramsAllAndReadonlyDigestZkACLProvider.java | 23 +++-- ...redentialsDigestZkCredentialsProvider.java | 17 ++-- .../solr/common/cloud/ZkACLProvider.java | 11 ++- .../cloud/ZkClientConnectionStrategy.java | 27 +++--- .../solr/common/cloud/ZkCmdExecutor.java | 3 +- .../solr/common/cloud/ZkConfigManager.java | 1 - .../solr/common/cloud/ZkCoreNodeProps.java | 27 +++--- .../common/cloud/ZkCredentialsProvider.java | 7 +- .../apache/solr/common/cloud/ZkNodeProps.java | 3 +- .../apache/solr/common/cloud/ZkOperation.java | 6 +- .../solr/common/cloud/ZkStateReader.java | 5 +- .../solr/common/cloud/ZooKeeperException.java | 4 +- .../solr/common/cloud/package-info.java | 1 - .../apache/solr/common/luke/FieldFlag.java | 4 +- .../apache/solr/common/luke/package-info.java | 1 - .../org/apache/solr/common/package-info.java | 1 - .../solr/common/params/AnalysisParams.java | 1 - .../common/params/AppendedSolrParams.java | 1 - .../solr/common/params/CollectionParams.java | 3 +- .../solr/common/params/CommonAdminParams.java | 1 - .../solr/common/params/CommonParams.java | 1 - .../solr/common/params/ConfigSetParams.java | 3 +- .../solr/common/params/CoreAdminParams.java | 1 - .../solr/common/params/CursorMarkParams.java | 1 - .../solr/common/params/DefaultSolrParams.java | 1 - .../solr/common/params/DisMaxParams.java | 1 - .../solr/common/params/EventParams.java | 4 +- .../solr/common/params/ExpandParams.java | 1 - .../solr/common/params/FacetParams.java | 1 - .../solr/common/params/GroupParams.java | 1 - .../solr/common/params/HighlightParams.java | 1 - .../solr/common/params/MapSolrParams.java | 1 - .../common/params/ModifiableSolrParams.java | 1 - .../common/params/MoreLikeThisParams.java | 1 - .../common/params/MultiMapSolrParams.java | 1 - .../common/params/QueryElevationParams.java | 4 +- .../common/params/RequiredSolrParams.java | 1 - .../solr/common/params/ShardParams.java | 1 - .../solr/common/params/SimpleParams.java | 3 +- .../apache/solr/common/params/SolrParams.java | 1 - .../solr/common/params/SpatialParams.java | 4 +- .../solr/common/params/SpellingParams.java | 1 - .../solr/common/params/StatsParams.java | 1 - .../solr/common/params/TermVectorParams.java | 4 +- .../solr/common/params/TermsParams.java | 1 - .../solr/common/params/UpdateParams.java | 1 - .../solr/common/params/package-info.java | 1 - .../apache/solr/common/util/ByteUtils.java | 1 - .../org/apache/solr/common/util/Cache.java | 3 +- .../solr/common/util/ContentStream.java | 1 - .../solr/common/util/ContentStreamBase.java | 1 - .../common/util/DataInputInputStream.java | 1 - .../org/apache/solr/common/util/DateUtil.java | 3 +- .../apache/solr/common/util/ExecutorUtil.java | 11 ++- .../solr/common/util/FastInputStream.java | 1 - .../solr/common/util/FastOutputStream.java | 1 - .../org/apache/solr/common/util/Hash.java | 3 +- .../org/apache/solr/common/util/IOUtils.java | 15 ++-- .../solr/common/util/IteratorChain.java | 1 - .../apache/solr/common/util/NamedList.java | 1 - .../common/util/ObjectReleaseTracker.java | 3 +- .../org/apache/solr/common/util/Pair.java | 3 +- .../apache/solr/common/util/RetryUtil.java | 11 ++- .../solr/common/util/SimpleOrderedMap.java | 3 +- .../common/util/SolrjNamedThreadFactory.java | 9 +- .../org/apache/solr/common/util/StrUtils.java | 1 - .../solr/common/util/SuppressForbidden.java | 3 +- .../org/apache/solr/common/util/URLUtil.java | 1 - .../org/apache/solr/common/util/Utils.java | 4 +- .../java/org/apache/solr/common/util/XML.java | 1 - .../solr/common/util/XMLErrorLogger.java | 1 - .../apache/solr/common/util/package-info.java | 1 - ...lectionAdminRequestRequiredParamsTest.java | 3 +- .../apache/solr/client/solrj/GetByIdTest.java | 3 +- .../client/solrj/LargeVolumeTestBase.java | 1 - .../solrj/MergeIndexesExampleTestBase.java | 1 - .../client/solrj/SolrExampleBinaryTest.java | 1 - .../client/solrj/SolrExampleTestBase.java | 1 - .../solr/client/solrj/SolrExampleTests.java | 1 - .../client/solrj/SolrExampleTestsBase.java | 1 - .../solr/client/solrj/SolrExampleXMLTest.java | 1 - .../solr/client/solrj/SolrExceptionTest.java | 1 - .../solr/client/solrj/SolrQueryTest.java | 1 - .../solrj/SolrSchemalessExampleTest.java | 1 - .../solr/client/solrj/StartSolrJetty.java | 1 - .../client/solrj/TestLBHttpSolrClient.java | 1 - .../client/solrj/TestSolrJErrorHandling.java | 7 +- .../AbstractEmbeddedSolrServerTestCase.java | 3 +- .../solrj/embedded/JettyWebappTest.java | 1 - .../embedded/LargeVolumeEmbeddedTest.java | 1 - .../solrj/embedded/LargeVolumeJettyTest.java | 1 - .../embedded/MergeIndexesEmbeddedTest.java | 1 - .../embedded/SolrExampleEmbeddedTest.java | 1 - .../solrj/embedded/SolrExampleJettyTest.java | 1 - .../SolrExampleStreamingBinaryTest.java | 3 +- .../embedded/SolrExampleStreamingTest.java | 1 - .../embedded/TestEmbeddedSolrServer.java | 3 +- .../solrj/embedded/TestSolrProperties.java | 1 - .../solrj/impl/BasicHttpSolrClientTest.java | 1 - .../CloudSolrClientMultiConstructorTest.java | 21 +++-- .../solrj/impl/CloudSolrClientTest.java | 3 +- .../impl/ConcurrentUpdateSolrClientTest.java | 1 - .../solrj/impl/ExternalHttpClientTest.java | 3 +- .../solrj/impl/LBHttpSolrClientTest.java | 1 - .../impl/SolrPortAwareCookieSpecTest.java | 3 +- .../impl/TestCloudSolrClientConnections.java | 3 +- .../client/solrj/io/sql/JdbcDriverTest.java | 3 +- .../solr/client/solrj/io/sql/JdbcTest.java | 3 +- .../solrj/io/stream/JDBCStreamTest.java | 3 +- .../solrj/io/stream/RecordCountStream.java | 2 +- .../solrj/io/stream/StreamExpressionTest.java | 3 +- .../StreamExpressionToExpessionTest.java | 3 +- .../client/solrj/io/stream/StreamingTest.java | 3 +- .../expr/StreamExpressionParserTest.java | 3 +- .../io/stream/ops/ConcatOperationTest.java | 3 +- .../solrj/io/stream/ops/OperationsTest.java | 3 +- .../solr/client/solrj/request/SchemaTest.java | 3 +- .../client/solrj/request/SolrPingTest.java | 3 +- .../request/TestConfigSetAdminRequest.java | 1 - .../client/solrj/request/TestCoreAdmin.java | 1 - .../solrj/request/TestUpdateRequest.java | 3 +- .../response/AnlysisResponseBaseTest.java | 1 - .../DocumentAnalysisResponseTest.java | 1 - .../client/solrj/response/FacetFieldTest.java | 3 +- .../response/FieldAnalysisResponseTest.java | 1 - .../response/NoOpResponseParserTest.java | 3 +- .../solrj/response/QueryResponseTest.java | 1 - .../solrj/response/TermsResponseTest.java | 3 +- .../response/TestClusteringResponse.java | 3 +- .../response/TestSpellCheckResponse.java | 3 +- .../solrj/response/TestSuggesterResponse.java | 3 +- .../client/solrj/util/ClientUtilsTest.java | 1 - .../apache/solr/common/SolrDocumentTest.java | 1 - .../solr/common/cloud/SolrZkClientTest.java | 3 +- .../common/cloud/TestZkConfigManager.java | 1 - .../common/params/CommonAdminParamsTest.java | 1 - .../solr/common/params/CommonParamsTest.java | 1 - .../params/ModifiableSolrParamsTest.java | 25 +++--- .../solr/common/params/ShardParamsTest.java | 3 +- .../solr/common/params/SolrParamTest.java | 1 - .../solr/common/util/ContentStreamTest.java | 1 - .../solr/common/util/IteratorChainTest.java | 1 - .../solr/common/util/NamedListTest.java | 1 - .../apache/solr/common/util/TestDateUtil.java | 3 +- .../org/apache/solr/common/util/TestHash.java | 3 +- .../solr/common/util/TestJavaBinCodec.java | 3 +- .../common/util/TestJsonRecordReader.java | 3 +- .../solr/common/util/TestRetryUtil.java | 3 +- .../solr/common/util/TestXMLEscaping.java | 1 - .../apache/solr/common/util/URLUtilTest.java | 1 - .../solr/BaseDistributedSearchTestCase.java | 3 +- .../java/org/apache/solr/JSONTestUtil.java | 1 - .../apache/solr/SolrIgnoredThreadsFilter.java | 13 ++- .../org/apache/solr/SolrJettyTestBase.java | 3 +- .../java/org/apache/solr/SolrTestCaseHS.java | 4 +- .../java/org/apache/solr/SolrTestCaseJ4.java | 1 - .../solr/analysis/MockCharFilterFactory.java | 3 +- .../solr/analysis/MockTokenFilterFactory.java | 3 +- .../solr/analysis/MockTokenizerFactory.java | 3 +- .../StringMockSolrResourceLoader.java | 3 +- .../solr/cloud/AbstractDistribZkTestBase.java | 3 +- .../apache/solr/cloud/AbstractZkTestCase.java | 3 +- .../org/apache/solr/cloud/ChaosMonkey.java | 7 +- .../apache/solr/cloud/CloudInspectUtil.java | 33 ++++--- .../java/org/apache/solr/cloud/IpTables.java | 4 +- .../solr/cloud/MiniSolrCloudCluster.java | 3 +- .../apache/solr/cloud/MockSolrZkClient.java | 3 +- .../apache/solr/cloud/MockZkStateReader.java | 3 +- .../org/apache/solr/cloud/SocketProxy.java | 3 +- .../solr/cloud/StoppableIndexingThread.java | 25 +++--- .../solr/cloud/StoppableSearchThread.java | 7 +- .../org/apache/solr/cloud/ZkTestServer.java | 27 +++--- .../solr/core/AbstractBadConfigTestBase.java | 1 - .../solr/core/MockDirectoryFactory.java | 3 +- .../solr/core/MockFSDirectoryFactory.java | 3 +- .../TrackingShardHandlerFactory.java | 3 +- .../processor/BufferingRequestProcessor.java | 1 - .../solr/util/AbstractSolrTestCase.java | 2 - .../solr/util/BadHdfsThreadsFilter.java | 3 +- .../solr/util/BadMrClusterThreadsFilter.java | 3 +- .../solr/util/BadZookeeperThreadsFilter.java | 3 +- .../org/apache/solr/util/BaseTestHarness.java | 3 +- .../org/apache/solr/util/DOMUtilTestBase.java | 1 - .../org/apache/solr/util/ExternalPaths.java | 3 +- .../solr/util/RESTfulServerProvider.java | 3 +- .../solr/util/RandomForceMergePolicy.java | 1 - .../apache/solr/util/RandomMergePolicy.java | 1 - .../solr/util/ReadOnlyCoresLocator.java | 3 +- .../org/apache/solr/util/RestTestBase.java | 3 +- .../org/apache/solr/util/RestTestHarness.java | 3 +- .../util/RevertDefaultThreadHandlerRule.java | 23 +++-- .../org/apache/solr/util/SSLTestConfig.java | 3 +- .../org/apache/solr/util/TestHarness.java | 1 - 5570 files changed, 10101 insertions(+), 13690 deletions(-) diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicAnalyzer.java index 00efcfd7bdb..3d36c86b35a 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ar; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ar; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ar; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicNormalizationFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicNormalizationFilter.java index c9f0feff14a..ba941061c26 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicNormalizationFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicNormalizationFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ar; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ar; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ar; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicNormalizationFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicNormalizationFilterFactory.java index 53fc4c1d02c..05686142b0c 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicNormalizationFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicNormalizationFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ar; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ar; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ar; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicNormalizer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicNormalizer.java index 5912f10c463..92a818d95d0 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicNormalizer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicNormalizer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ar; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ar; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ar; + import static org.apache.lucene.analysis.util.StemmerUtil.*; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicStemFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicStemFilter.java index e894ec82714..f1d0fa3c164 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicStemFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ar; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ar; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ar; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicStemFilterFactory.java index 58bc29b70cb..ec8b2ed3487 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ar; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ar; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ar; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicStemmer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicStemmer.java index 908147a5f2c..6093317d3b0 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicStemmer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicStemmer.java @@ -1,6 +1,3 @@ -package org.apache.lucene.analysis.ar; - - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +14,9 @@ package org.apache.lucene.analysis.ar; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ar; + + import static org.apache.lucene.analysis.util.StemmerUtil.*; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/package-info.java index dfb2cab2dbd..573812311ef 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analyzer for Arabic. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianAnalyzer.java index d461dd01b80..24746e4ea99 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.bg; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.bg; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.bg; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemFilter.java index c122b69a149..eec74a6230c 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.bg; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.bg; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.bg; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemFilterFactory.java index 0c7b010b237..62b731aa2f7 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.bg; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.bg; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.bg; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemmer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemmer.java index e79a8bb25db..0f5ebb2b4ab 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemmer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/BulgarianStemmer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.bg; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.bg; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.bg; + import static org.apache.lucene.analysis.util.StemmerUtil.*; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/package-info.java index c60a53bdf9a..d4ffb240f77 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analyzer for Bulgarian. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianAnalyzer.java index 3c4decb0461..3b025679dee 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.br; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.br; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.br; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemFilter.java index b6a6650ba1c..e605df54f18 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.br; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.br; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.br; + import java.io.IOException; import java.util.Set; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemFilterFactory.java index c97f3323067..19aa2bed846 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.br; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.br; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.br; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemmer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemmer.java index 33629394744..0f96331c357 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemmer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/BrazilianStemmer.java @@ -1,7 +1,3 @@ -package org.apache.lucene.analysis.br; - -import java.util.Locale; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,10 @@ import java.util.Locale; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.br; + +import java.util.Locale; + /** * A stemmer for Brazilian Portuguese words. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/package-info.java index 080389bda07..84b482fca1a 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analyzer for Brazilian Portuguese. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ca/CatalanAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ca/CatalanAnalyzer.java index 61ca46bb8a1..cb674de0947 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ca/CatalanAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ca/CatalanAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ca; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ca; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ca; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ca/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ca/package-info.java index 7f8b0dad41d..fc1bb3ed5f2 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ca/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ca/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analyzer for Catalan. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/BaseCharFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/BaseCharFilter.java index 1a960760410..48ffa48eefd 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/BaseCharFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/BaseCharFilter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.charfilter; import org.apache.lucene.analysis.CharFilter; 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 d5a8eb83621..1f681a8936c 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 @@ -1,7 +1,5 @@ /* The following code was generated by JFlex 1.6.0 */ -package org.apache.lucene.analysis.charfilter; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +16,7 @@ package org.apache.lucene.analysis.charfilter; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.charfilter; import java.io.IOException; import java.io.Reader; 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 9db8c7ef366..352ede79ffa 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 @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.charfilter; - /* * 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.lucene.analysis.charfilter; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.charfilter; import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilterFactory.java index 1e0920bbee1..9a237c2cb7b 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/HTMLStripCharFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.charfilter; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.charfilter; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.charfilter; + import org.apache.lucene.analysis.util.CharFilterFactory; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/MappingCharFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/MappingCharFilter.java index 095d0039ce7..764e1c659f1 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/MappingCharFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/MappingCharFilter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.charfilter; import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/MappingCharFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/MappingCharFilterFactory.java index f3948d6681b..7aba3b2fc31 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/MappingCharFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/MappingCharFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.charfilter; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.charfilter; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.charfilter; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/NormalizeCharMap.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/NormalizeCharMap.java index ca2c7780e88..e7243741555 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/NormalizeCharMap.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/NormalizeCharMap.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.charfilter; import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/package-info.java index 12a43a5efdd..f6b043d4a17 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Normalization of text before the tokenizer. *

diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKAnalyzer.java index ddbf0cd0ed9..ed8eee6d9c8 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.cjk; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.cjk; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.cjk; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKBigramFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKBigramFilter.java index f92023cb45d..bf4f6218bb9 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKBigramFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKBigramFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.cjk; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.cjk; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.cjk; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKBigramFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKBigramFilterFactory.java index a2359413e6d..d7da5b017c3 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKBigramFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKBigramFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.cjk; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.cjk; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.cjk; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKWidthFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKWidthFilter.java index d01bae4569a..485ac63b637 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKWidthFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKWidthFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.cjk; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.cjk; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.cjk; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKWidthFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKWidthFilterFactory.java index 71533440486..c59b86a6e1e 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKWidthFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/CJKWidthFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.cjk; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.cjk; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.cjk; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/package-info.java index 2fd4ad45a7a..f3e0036b410 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analyzer for Chinese, Japanese, and Korean, which indexes bigrams. * This analyzer generates bigram terms, which are overlapping groups of two adjacent Han, Hiragana, Katakana, or Hangul characters. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/SoraniAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/SoraniAnalyzer.java index cbfd78d43de..78304c7d6cd 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/SoraniAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/SoraniAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ckb; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ckb; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ckb; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/SoraniNormalizationFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/SoraniNormalizationFilter.java index 3c4622a61e6..6819b5b0d84 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/SoraniNormalizationFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/SoraniNormalizationFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ckb; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ckb; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ckb; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/SoraniNormalizationFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/SoraniNormalizationFilterFactory.java index 56cf08f3ac4..1f99a51a3f2 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/SoraniNormalizationFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/SoraniNormalizationFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ckb; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ckb; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ckb; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/SoraniNormalizer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/SoraniNormalizer.java index 14dbc374fe0..bb9187c3ed0 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/SoraniNormalizer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/SoraniNormalizer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ckb; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ckb; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ckb; + import static org.apache.lucene.analysis.util.StemmerUtil.delete; /** diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/SoraniStemFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/SoraniStemFilter.java index 174ea1e1631..0d7a207471d 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/SoraniStemFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/SoraniStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ckb; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ckb; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ckb; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/SoraniStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/SoraniStemFilterFactory.java index a76d14927a9..8d3e98445cf 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/SoraniStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/SoraniStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ckb; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ckb; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ckb; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/SoraniStemmer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/SoraniStemmer.java index 16a72ef113d..70c5e7f5142 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/SoraniStemmer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/SoraniStemmer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ckb; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ckb; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ckb; + import static org.apache.lucene.analysis.util.StemmerUtil.endsWith; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/package-info.java index 5fccddfc7a4..74e8af8c828 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analyzer for Sorani Kurdish. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilter.java index 2d53b3f4f2d..35deddea7a0 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.commongrams; import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilterFactory.java index 82765f45f69..ebd5ec385e8 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.commongrams; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.commongrams; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.commongrams; + import java.io.IOException; import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsQueryFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsQueryFilterFactory.java index 6a72c1a029e..034ed56254c 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsQueryFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsQueryFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.commongrams; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.commongrams; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.commongrams; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/package-info.java index 4c9eaba28ab..282a638e1ff 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Construct n-grams for frequently occurring terms and phrases. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/CompoundWordTokenFilterBase.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/CompoundWordTokenFilterBase.java index b6718afdc9b..1920401dd8c 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/CompoundWordTokenFilterBase.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/CompoundWordTokenFilterBase.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.compound; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.compound; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.compound; + import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilter.java index c94950e5954..3dfe3ab80fb 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.compound; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.compound; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.compound; + import org.apache.lucene.analysis.TokenStream; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilterFactory.java index 25d4a745339..440ab5e20c2 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/DictionaryCompoundWordTokenFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.compound; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.compound; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.compound; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.util.CharArraySet; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilter.java index 1ad61daff2e..c047358524d 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.compound; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.compound; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.compound; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.compound.hyphenation.Hyphenation; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java index 0fe31d002f7..3b8d0b76cca 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/HyphenationCompoundWordTokenFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.compound; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.compound; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.compound; + import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/ByteVector.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/ByteVector.java index e8ad2d6e269..8e83893af1d 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/ByteVector.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/ByteVector.java @@ -5,9 +5,9 @@ * 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 - * + * + * 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. @@ -15,7 +15,6 @@ * limitations under the License. */ - package org.apache.lucene.analysis.compound.hyphenation; /** diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/CharVector.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/CharVector.java index fa277550b50..c61ac19402c 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/CharVector.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/CharVector.java @@ -5,16 +5,15 @@ * 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 - * + * + * 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.analysis.compound.hyphenation; /** diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/Hyphen.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/Hyphen.java index 151c37fb92c..1845f25f82f 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/Hyphen.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/Hyphen.java @@ -5,16 +5,15 @@ * 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 - * + * + * 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.analysis.compound.hyphenation; /** diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/Hyphenation.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/Hyphenation.java index aa9974824f6..3fb1e04d742 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/Hyphenation.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/Hyphenation.java @@ -5,16 +5,15 @@ * 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 - * + * + * 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.analysis.compound.hyphenation; /** diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/HyphenationTree.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/HyphenationTree.java index 62f6426d2a3..0f7dd2b5c48 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/HyphenationTree.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/HyphenationTree.java @@ -5,16 +5,15 @@ * 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 - * + * + * 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.analysis.compound.hyphenation; import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/PatternConsumer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/PatternConsumer.java index e20126f3f6f..358841c4fc9 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/PatternConsumer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/PatternConsumer.java @@ -5,16 +5,15 @@ * 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 - * + * + * 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.analysis.compound.hyphenation; import java.util.ArrayList; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/PatternParser.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/PatternParser.java index 9aa4e381ad3..f5f31d87a8f 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/PatternParser.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/PatternParser.java @@ -5,16 +5,15 @@ * 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 - * + * + * 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.analysis.compound.hyphenation; // SAX diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/TernaryTree.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/TernaryTree.java index c2651341a67..6aeb69b2ca0 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/TernaryTree.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/TernaryTree.java @@ -5,16 +5,15 @@ * 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 - * + * + * 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.analysis.compound.hyphenation; import java.io.PrintStream; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/package-info.java index 27de95181d7..b26ae8f1ae7 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Hyphenation code for the CompoundWordTokenFilter. * The code for the compound word hyphenation is taken from the diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/package-info.java index 126f887f364..c88dcc9a395 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * A filter that decomposes compound words you find in many Germanic * languages into the word parts. This example shows what it does: diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/DecimalDigitFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/DecimalDigitFilter.java index 013ed51e59d..b81d42fedc9 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/DecimalDigitFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/DecimalDigitFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.core; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/DecimalDigitFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/DecimalDigitFilterFactory.java index 9b3c9f5aa61..214269206ae 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/DecimalDigitFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/DecimalDigitFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.core; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/KeywordAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/KeywordAnalyzer.java index 6002ea99309..25436f966c7 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/KeywordAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/KeywordAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.core; + import org.apache.lucene.analysis.Analyzer; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/KeywordTokenizer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/KeywordTokenizer.java index 9997d40155a..209ecee4961 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/KeywordTokenizer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/KeywordTokenizer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.core; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/KeywordTokenizerFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/KeywordTokenizerFactory.java index 8c5588626f6..3654f67beab 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/KeywordTokenizerFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/KeywordTokenizerFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.core; + import org.apache.lucene.analysis.util.TokenizerFactory; import org.apache.lucene.util.AttributeFactory; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LetterTokenizer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LetterTokenizer.java index 5c0b6d2bcc9..df41b3777cb 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LetterTokenizer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LetterTokenizer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.core; + import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.util.CharTokenizer; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LetterTokenizerFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LetterTokenizerFactory.java index 11dae66d2b2..828d6cf3fed 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LetterTokenizerFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LetterTokenizerFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.core; + import org.apache.lucene.analysis.util.TokenizerFactory; import org.apache.lucene.util.AttributeFactory; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseFilter.java index 7a7e96898a9..d1198a68be2 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.core; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseFilterFactory.java index ded2966292b..785daa504fb 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.core; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseTokenizer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseTokenizer.java index 66586f77154..982d356533e 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseTokenizer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseTokenizer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.core; + import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.util.AttributeFactory; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseTokenizerFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseTokenizerFactory.java index 68b3c049722..3e29161a923 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseTokenizerFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/LowerCaseTokenizerFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.core; + import org.apache.lucene.analysis.util.AbstractAnalysisFactory; import org.apache.lucene.analysis.util.MultiTermAwareComponent; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/SimpleAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/SimpleAnalyzer.java index 503b95ae72a..45c8d23a24c 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/SimpleAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/SimpleAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.core; + import org.apache.lucene.analysis.Analyzer; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/StopAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/StopAnalyzer.java index e25774e8951..9f4b05a2a3d 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/StopAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/StopAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.core; + import java.io.File; import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/StopFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/StopFilter.java index 2c3f000e25d..fc33a1c58e4 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/StopFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/StopFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.core; + import java.util.Arrays; import java.util.List; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/StopFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/StopFilterFactory.java index 7bf32429b1f..d3f6aff5ae4 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/StopFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/StopFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.core; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.util.CharArraySet; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/TypeTokenFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/TypeTokenFilter.java index d2791dfbf95..d7447d6bc93 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/TypeTokenFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/TypeTokenFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.core; + import java.util.Set; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/TypeTokenFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/TypeTokenFilterFactory.java index 089ef7adb83..fe7b654d0b5 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/TypeTokenFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/TypeTokenFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.core; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.util.ResourceLoader; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/UnicodeWhitespaceAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/UnicodeWhitespaceAnalyzer.java index 2c7d5e1fe4f..0dcaad97f8a 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/UnicodeWhitespaceAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/UnicodeWhitespaceAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.core; + import org.apache.lucene.analysis.Analyzer; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/UnicodeWhitespaceTokenizer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/UnicodeWhitespaceTokenizer.java index 79564db560b..5e4313f6c51 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/UnicodeWhitespaceTokenizer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/UnicodeWhitespaceTokenizer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.core; + import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.util.CharTokenizer; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/UpperCaseFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/UpperCaseFilter.java index 6fdae1b685a..9c2c28362c0 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/UpperCaseFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/UpperCaseFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.core; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/UpperCaseFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/UpperCaseFilterFactory.java index ac97ad7bd0a..d19f83219c1 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/UpperCaseFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/UpperCaseFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.core; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/WhitespaceAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/WhitespaceAnalyzer.java index 855f4f6a88c..a71039a9fb8 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/WhitespaceAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/WhitespaceAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.core; + import org.apache.lucene.analysis.Analyzer; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/WhitespaceTokenizer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/WhitespaceTokenizer.java index 9c0c960fff2..70f2d620bbd 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/WhitespaceTokenizer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/WhitespaceTokenizer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.core; + import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.util.CharTokenizer; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/WhitespaceTokenizerFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/WhitespaceTokenizerFactory.java index 98f621d1f8d..fd38b632adc 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/WhitespaceTokenizerFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/WhitespaceTokenizerFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.core; + import java.util.Arrays; import java.util.Collection; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/package-info.java index 7aba1e28cef..61ec057d58c 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Basic, general-purpose analysis components. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/custom/CustomAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/custom/CustomAnalyzer.java index 5f813150e5b..f2ed01f4e9f 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/custom/CustomAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/custom/CustomAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.custom; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.custom; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.custom; + import static org.apache.lucene.analysis.util.AnalysisSPILoader.newFactoryClassInstance; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/custom/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/custom/package-info.java index 9419282e4b5..8b5cdedd523 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/custom/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/custom/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * A general-purpose Analyzer that can be created with a builder-style API. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java index 426663a0628..6b664c399bc 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.cz; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.cz; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.cz; + import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.core.LowerCaseFilter; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechStemFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechStemFilter.java index 6cf89f5eb5a..9a4ea294a76 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechStemFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechStemFilter.java @@ -1,13 +1,3 @@ -package org.apache.lucene.analysis.cz; - -import java.io.IOException; - -import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; // for javadoc -import org.apache.lucene.analysis.TokenFilter; -import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.tokenattributes.KeywordAttribute; -import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -24,6 +14,16 @@ import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.cz; + +import java.io.IOException; + +import org.apache.lucene.analysis.miscellaneous.SetKeywordMarkerFilter; // for javadoc +import org.apache.lucene.analysis.TokenFilter; +import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.tokenattributes.KeywordAttribute; +import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; + /** * A {@link TokenFilter} that applies {@link CzechStemmer} to stem Czech words. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechStemFilterFactory.java index de40b3f27fd..0b016ad4b69 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.cz; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.cz; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.cz; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechStemmer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechStemmer.java index 5646ccd18b3..d54a2248196 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechStemmer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechStemmer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.cz; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.cz; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.cz; + import static org.apache.lucene.analysis.util.StemmerUtil.*; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/cz/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/cz/package-info.java index 92d5ffc701b..70ae01f845e 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/cz/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/cz/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analyzer for Czech. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/da/DanishAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/da/DanishAnalyzer.java index 7f2720addc2..1b11a1c2044 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/da/DanishAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/da/DanishAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.da; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.da; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.da; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/da/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/da/package-info.java index ff6eebb6c4d..38eb5f018f3 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/da/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/da/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analyzer for Danish. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java index f2d29b4385f..23e01bee5ff 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanAnalyzer.java @@ -1,6 +1,3 @@ -package org.apache.lucene.analysis.de; -// This file is encoded in UTF-8 - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +14,9 @@ package org.apache.lucene.analysis.de; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.de; +// This file is encoded in UTF-8 + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanLightStemFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanLightStemFilter.java index f9ef1e4124a..5962bbc0165 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanLightStemFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanLightStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.de; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.de; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.de; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanLightStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanLightStemFilterFactory.java index 6bf7412c9a2..f3ef1f479de 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanLightStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanLightStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.de; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.de; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.de; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanLightStemmer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanLightStemmer.java index 5b84ab39587..94452e0e8be 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanLightStemmer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanLightStemmer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.de; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.de; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.de; + /* * This algorithm is updated based on code located at: diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanMinimalStemFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanMinimalStemFilter.java index 8d9fed9e7a6..8b0a1300a37 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanMinimalStemFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanMinimalStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.de; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.de; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.de; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanMinimalStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanMinimalStemFilterFactory.java index 6231e2544ca..b9b0fa82847 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanMinimalStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanMinimalStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.de; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.de; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.de; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanMinimalStemmer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanMinimalStemmer.java index fd9996631ff..34ce2beba28 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanMinimalStemmer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanMinimalStemmer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.de; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.de; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.de; + /* * This algorithm is updated based on code located at: diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanNormalizationFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanNormalizationFilter.java index 45b1e734611..b7091ae0ad9 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanNormalizationFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanNormalizationFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.de; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.de; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.de; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanNormalizationFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanNormalizationFilterFactory.java index 978908e3ae6..f922af89bfe 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanNormalizationFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanNormalizationFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.de; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.de; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.de; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemFilter.java index 69715398cae..42d2752b9fe 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.de; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.de; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.de; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemFilterFactory.java index bd8e942f9e9..d7f578e9193 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.de; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.de; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.de; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemmer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemmer.java index 6b2ae88607b..971b36e1e03 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemmer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/GermanStemmer.java @@ -1,9 +1,3 @@ -package org.apache.lucene.analysis.de; - -import java.util.Locale; - -// This file is encoded in UTF-8 - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -20,6 +14,12 @@ import java.util.Locale; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.de; + +import java.util.Locale; + +// This file is encoded in UTF-8 + /** * A stemmer for German words. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/package-info.java index ee37e347a1e..fdaa4693a7f 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analyzer for German. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekAnalyzer.java index 100b3ac53d1..f039edb98cb 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekAnalyzer.java @@ -1,11 +1,10 @@ -package org.apache.lucene.analysis.el; - /* - * Copyright 2005 The Apache Software Foundation - * - * Licensed 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 + * 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 * @@ -15,6 +14,7 @@ package org.apache.lucene.analysis.el; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.el; import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekLowerCaseFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekLowerCaseFilter.java index 88d299764aa..e4aecf36d85 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekLowerCaseFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekLowerCaseFilter.java @@ -1,11 +1,10 @@ -package org.apache.lucene.analysis.el; - /* - * Copyright 2005 The Apache Software Foundation - * - * Licensed 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 + * 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 * @@ -15,6 +14,7 @@ package org.apache.lucene.analysis.el; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.el; import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekLowerCaseFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekLowerCaseFilterFactory.java index 5ff0c90f63e..ce1ec082d1c 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekLowerCaseFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekLowerCaseFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.el; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.el; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.el; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekStemFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekStemFilter.java index 9299541eb7f..16241757f83 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekStemFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.el; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.el; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.el; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekStemFilterFactory.java index b6b589d7748..618f52dfca3 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.el; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.el; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.el; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekStemmer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekStemmer.java index fee2f67b109..c09cafaa365 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekStemmer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/GreekStemmer.java @@ -1,9 +1,3 @@ -package org.apache.lucene.analysis.el; - -import org.apache.lucene.analysis.util.CharArraySet; - -import java.util.Arrays; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -20,6 +14,12 @@ import java.util.Arrays; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.el; + +import org.apache.lucene.analysis.util.CharArraySet; + +import java.util.Arrays; + /** * A stemmer for Greek words, according to: Development of a Stemmer for the diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/package-info.java index ff3391e243c..228e88c5aee 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analyzer for Greek. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishAnalyzer.java index 15bfb51a518..721d9b2521d 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.en; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.en; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.en; + import java.io.Reader; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishMinimalStemFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishMinimalStemFilter.java index 72dc6a9ccc0..4216998f5e2 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishMinimalStemFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishMinimalStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.en; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.en; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.en; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishMinimalStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishMinimalStemFilterFactory.java index e9b5d1ba8d3..008b34d9d06 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishMinimalStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishMinimalStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.en; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.en; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.en; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishMinimalStemmer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishMinimalStemmer.java index 52d62c0a276..6e2200b1511 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishMinimalStemmer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishMinimalStemmer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.en; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.en; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.en; + /** * Minimal plural stemmer for English. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishPossessiveFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishPossessiveFilter.java index e4e03a1c1b3..98302b32221 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishPossessiveFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishPossessiveFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.en; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.en; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.en; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishPossessiveFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishPossessiveFilterFactory.java index 40f1d30751d..af808525834 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishPossessiveFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/EnglishPossessiveFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.en; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.en; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.en; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/KStemFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/KStemFilter.java index f5d7904c649..bbd07ee1f24 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/KStemFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/KStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.en; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.en; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.en; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/KStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/KStemFilterFactory.java index dcfc66ab1f6..092a2a335ea 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/KStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/KStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.en; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.en; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.en; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/KStemmer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/KStemmer.java index 204eaabc1e3..3348d9a785a 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/KStemmer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/KStemmer.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /* This file was partially derived from the original CIIR University of Massachusetts Amherst version of KStemmer.java (license for diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemFilter.java index f61f61c4850..f102f6dac51 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.en; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.en; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.en; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemFilterFactory.java index fc612e09a95..61b56626dda 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.en; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.en; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.en; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemmer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemmer.java index 8c3ad286651..041d7b83b6f 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemmer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/PorterStemmer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.en; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.en; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.en; + /* diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/package-info.java index be0f03752d6..976f26915cf 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analyzer for English. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishAnalyzer.java index 3c2812bbd2d..0e4747f3e22 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.es; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.es; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.es; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishLightStemFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishLightStemFilter.java index ba05b682d1b..691570616f4 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishLightStemFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishLightStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.es; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.es; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.es; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishLightStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishLightStemFilterFactory.java index 6dfc10e2736..49fcc8f076a 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishLightStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishLightStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.es; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.es; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.es; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishLightStemmer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishLightStemmer.java index cd9f4187c06..62ad8f30075 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishLightStemmer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/es/SpanishLightStemmer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.es; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.es; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.es; + /* * This algorithm is updated based on code located at: diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/es/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/es/package-info.java index 316a2d1cf5f..0048c81da81 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/es/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/es/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analyzer for Spanish. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/eu/BasqueAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/eu/BasqueAnalyzer.java index 4222e5a0998..db83cfb28ec 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/eu/BasqueAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/eu/BasqueAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.eu; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.eu; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.eu; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/eu/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/eu/package-info.java index 869b6cbb843..f34fd4503bf 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/eu/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/eu/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analyzer for Basque. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianAnalyzer.java index d53a2ba4247..256c78be2f4 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.fa; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.fa; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.fa; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianCharFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianCharFilter.java index b8d8c97ffae..8009c4929cd 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianCharFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianCharFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.fa; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.fa; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.fa; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianCharFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianCharFilterFactory.java index 08d490ea3bb..69288fc1adb 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianCharFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianCharFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.fa; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.fa; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.fa; + import java.io.Reader; import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianNormalizationFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianNormalizationFilter.java index 914e17966f6..0ebe9e77faf 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianNormalizationFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianNormalizationFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.fa; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.fa; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.fa; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianNormalizationFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianNormalizationFilterFactory.java index 7b64b7081ea..e5d78de360f 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianNormalizationFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianNormalizationFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.fa; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.fa; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.fa; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianNormalizer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianNormalizer.java index 051e3a8a549..ee11021fd50 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianNormalizer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianNormalizer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.fa; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.fa; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.fa; + import static org.apache.lucene.analysis.util.StemmerUtil.*; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/package-info.java index b3d45074f80..33769447dfb 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analyzer for Persian. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishAnalyzer.java index 84a3c4ffd5f..4cc62db59b1 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.fi; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.fi; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.fi; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishLightStemFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishLightStemFilter.java index 128c313fe6a..c4bfa9ce512 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishLightStemFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishLightStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.fi; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.fi; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.fi; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishLightStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishLightStemFilterFactory.java index ae9e8e006a8..5adc5a37b72 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishLightStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishLightStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.fi; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.fi; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.fi; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishLightStemmer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishLightStemmer.java index c866c075f3c..a0f13951504 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishLightStemmer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fi/FinnishLightStemmer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.fi; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.fi; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.fi; + /* * This algorithm is updated based on code located at: diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fi/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fi/package-info.java index e775cc9f263..6628e2de167 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fi/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fi/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analyzer for Finnish. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java index f0acba32e48..86088fde0bc 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.fr; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.fr; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.fr; + import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.core.LowerCaseFilter; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchLightStemFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchLightStemFilter.java index 179afe30b5a..1a630f03806 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchLightStemFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchLightStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.fr; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.fr; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.fr; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchLightStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchLightStemFilterFactory.java index a96dcda2538..8f74fc381ca 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchLightStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchLightStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.fr; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.fr; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.fr; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchLightStemmer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchLightStemmer.java index fbd0ad5f0c2..f2b8bccb228 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchLightStemmer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchLightStemmer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.fr; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.fr; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.fr; + /* * This algorithm is updated based on code located at: diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchMinimalStemFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchMinimalStemFilter.java index 68c8f3c7cf4..46f5f85ec3e 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchMinimalStemFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchMinimalStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.fr; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.fr; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.fr; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchMinimalStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchMinimalStemFilterFactory.java index e34cc1d19a9..f116bc05ceb 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchMinimalStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchMinimalStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.fr; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.fr; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.fr; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchMinimalStemmer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchMinimalStemmer.java index 05adeee3a96..4aca5da4689 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchMinimalStemmer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchMinimalStemmer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.fr; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.fr; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.fr; + /* * This algorithm is updated based on code located at: diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/package-info.java index 6e51ef343a4..b45c25deac2 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analyzer for French. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ga/IrishAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ga/IrishAnalyzer.java index 00413d55cf1..1e6d39a97ae 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ga/IrishAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ga/IrishAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ga; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ga; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ga; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ga/IrishLowerCaseFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ga/IrishLowerCaseFilter.java index 14582b25ca8..56cbd491ac4 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ga/IrishLowerCaseFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ga/IrishLowerCaseFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ga; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ga; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ga; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ga/IrishLowerCaseFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ga/IrishLowerCaseFilterFactory.java index 6b5460563c6..034c6d6142a 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ga/IrishLowerCaseFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ga/IrishLowerCaseFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ga; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ga; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ga; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ga/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ga/package-info.java index d6102e26cb4..a3fd183f197 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ga/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ga/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analyzer for Irish. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianAnalyzer.java index b79245ba15e..b9de3fad156 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.gl; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.gl; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.gl; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianMinimalStemFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianMinimalStemFilter.java index cff58502f81..48d3ceabc9e 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianMinimalStemFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianMinimalStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.gl; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.gl; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.gl; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianMinimalStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianMinimalStemFilterFactory.java index f1de1f70b56..d2de86db8ac 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianMinimalStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianMinimalStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.gl; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.gl; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.gl; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianMinimalStemmer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianMinimalStemmer.java index e75d7b04d25..7a4928ac908 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianMinimalStemmer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianMinimalStemmer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.gl; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.gl; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.gl; + import org.apache.lucene.analysis.pt.RSLPStemmerBase; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianStemFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianStemFilter.java index f9e7d5c7b3e..48705554436 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianStemFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.gl; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.gl; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.gl; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianStemFilterFactory.java index 9b48ad2ad76..f0b917e6317 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.gl; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.gl; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.gl; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianStemmer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianStemmer.java index 547cc9f5f89..eec1168b804 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianStemmer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/GalicianStemmer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.gl; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.gl; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.gl; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/package-info.java index 58d503da0c2..4e7076b2f3a 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analyzer for Galician. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiAnalyzer.java index 2e268a0597f..22e930b1d3a 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hi; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hi; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hi; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiNormalizationFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiNormalizationFilter.java index 2ffc2988c9a..441da125440 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiNormalizationFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiNormalizationFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hi; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hi; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hi; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiNormalizationFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiNormalizationFilterFactory.java index f30af4f01ef..329702a8c2f 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiNormalizationFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiNormalizationFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hi; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hi; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hi; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiNormalizer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiNormalizer.java index 8d9de3b97b7..a663b872a89 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiNormalizer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiNormalizer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hi; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hi; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hi; + import static org.apache.lucene.analysis.util.StemmerUtil.*; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiStemFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiStemFilter.java index a8ac018cf46..29fa2ac9060 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiStemFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hi; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hi; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hi; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiStemFilterFactory.java index c4773ce4d6a..3fc458f8112 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hi; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hi; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hi; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiStemmer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiStemmer.java index 65d2ce99378..9c2dbe0ef8c 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiStemmer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/HindiStemmer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hi; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hi; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hi; + import static org.apache.lucene.analysis.util.StemmerUtil.*; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/package-info.java index e0e4e0c7692..d45e28a1813 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analyzer for Hindi. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianAnalyzer.java index 8784e3bbb31..31fe9e26892 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hu; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hu; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hu; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianLightStemFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianLightStemFilter.java index 24fe47fd3db..72e7858030d 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianLightStemFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianLightStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hu; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hu; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hu; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianLightStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianLightStemFilterFactory.java index 62628fcaec9..5f62f4b9615 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianLightStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianLightStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hu; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hu; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hu; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianLightStemmer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianLightStemmer.java index 4746a60bbaa..931e7740b8e 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianLightStemmer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hu/HungarianLightStemmer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hu; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hu; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hu; + /* * This algorithm is updated based on code located at: diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hu/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hu/package-info.java index 49f7c854cf6..3ac2e93d2ea 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hu/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hu/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analyzer for Hungarian. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/Dictionary.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/Dictionary.java index d5db8391bae..8f0ce7fed0c 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/Dictionary.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/Dictionary.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hunspell; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hunspell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hunspell; + import java.io.BufferedInputStream; import java.io.BufferedOutputStream; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/HunspellStemFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/HunspellStemFilter.java index cc0258918f1..ea1dc3a8331 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/HunspellStemFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/HunspellStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hunspell; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hunspell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hunspell; + import java.io.IOException; import java.util.Collections; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/HunspellStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/HunspellStemFilterFactory.java index 222dac03b04..1c77c128737 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/HunspellStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/HunspellStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hunspell; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hunspell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hunspell; + import java.io.IOException; import java.io.InputStream; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/ISO8859_14Decoder.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/ISO8859_14Decoder.java index e1f6e00f722..7e7a588f4ad 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/ISO8859_14Decoder.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/ISO8859_14Decoder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hunspell; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hunspell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hunspell; + import java.nio.ByteBuffer; import java.nio.CharBuffer; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/Stemmer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/Stemmer.java index 9fa84346e16..748b3f18e8a 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/Stemmer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/Stemmer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hunspell; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hunspell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hunspell; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/package-info.java index 56a79088a8b..b735ba0e735 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Stemming TokenFilter using a Java implementation of the * Hunspell stemming algorithm. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hy/ArmenianAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hy/ArmenianAnalyzer.java index ae22c47d8b4..857117ab068 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hy/ArmenianAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hy/ArmenianAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hy; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hy; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hy; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hy/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hy/package-info.java index 07747b6db05..e03f10f2270 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hy/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hy/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analyzer for Armenian. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/id/IndonesianAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/id/IndonesianAnalyzer.java index d54b3609597..f7be17fd088 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/id/IndonesianAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/id/IndonesianAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.id; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.id; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.id; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/id/IndonesianStemFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/id/IndonesianStemFilter.java index 50a4f044d86..12284457d9f 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/id/IndonesianStemFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/id/IndonesianStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.id; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.id; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.id; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/id/IndonesianStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/id/IndonesianStemFilterFactory.java index 0ee825cb41d..ce7465e88d7 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/id/IndonesianStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/id/IndonesianStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.id; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.id; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.id; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/id/IndonesianStemmer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/id/IndonesianStemmer.java index 7dca44361f9..9b709645a9d 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/id/IndonesianStemmer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/id/IndonesianStemmer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.id; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.id; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.id; + import static org.apache.lucene.analysis.util.StemmerUtil.*; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/id/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/id/package-info.java index e94d99fd048..9cd5fdb4d13 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/id/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/id/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analyzer for Indonesian. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/in/IndicNormalizationFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/in/IndicNormalizationFilter.java index be4bec564f7..41421c229ce 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/in/IndicNormalizationFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/in/IndicNormalizationFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.in; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.in; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.in; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/in/IndicNormalizationFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/in/IndicNormalizationFilterFactory.java index 7f043446dc5..6229f8632c2 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/in/IndicNormalizationFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/in/IndicNormalizationFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.in; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.in; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.in; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/in/IndicNormalizer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/in/IndicNormalizer.java index 81bf4ed5936..43ef4778c96 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/in/IndicNormalizer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/in/IndicNormalizer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.in; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.in; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.in; + import java.util.BitSet; import java.util.IdentityHashMap; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/in/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/in/package-info.java index eada97dc755..063ab2faa09 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/in/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/in/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analyzer for Indian languages. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/it/ItalianAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/it/ItalianAnalyzer.java index afae44def4c..27027fa6511 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/it/ItalianAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/it/ItalianAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.it; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.it; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.it; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/it/ItalianLightStemFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/it/ItalianLightStemFilter.java index cc6d0c9a179..d320990925f 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/it/ItalianLightStemFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/it/ItalianLightStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.it; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.it; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.it; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/it/ItalianLightStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/it/ItalianLightStemFilterFactory.java index 3444ddd7649..e007eed6af9 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/it/ItalianLightStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/it/ItalianLightStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.it; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.it; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.it; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/it/ItalianLightStemmer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/it/ItalianLightStemmer.java index f7b5fb9b761..514ed9981c7 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/it/ItalianLightStemmer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/it/ItalianLightStemmer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.it; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.it; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.it; + /* * This algorithm is updated based on code located at: diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/it/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/it/package-info.java index ff7dc7b6554..acf3e2a7de4 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/it/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/it/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analyzer for Italian. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/lt/LithuanianAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/lt/LithuanianAnalyzer.java index 32efb88e2f2..f0424c90fd5 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/lt/LithuanianAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/lt/LithuanianAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.lt; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.lt; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.lt; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/lt/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/lt/package-info.java index c01c039e3e7..3dc8f103d05 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/lt/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/lt/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analyzer for Lithuanian. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/lv/LatvianAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/lv/LatvianAnalyzer.java index 0d858428cac..b22339dd39b 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/lv/LatvianAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/lv/LatvianAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.lv; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.lv; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.lv; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/lv/LatvianStemFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/lv/LatvianStemFilter.java index 38292a1372e..1d42ad78254 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/lv/LatvianStemFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/lv/LatvianStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.lv; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.lv; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.lv; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/lv/LatvianStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/lv/LatvianStemFilterFactory.java index 8318c03b841..90077f72bab 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/lv/LatvianStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/lv/LatvianStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.lv; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.lv; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.lv; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/lv/LatvianStemmer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/lv/LatvianStemmer.java index 42ad3a1884b..65230a28a70 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/lv/LatvianStemmer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/lv/LatvianStemmer.java @@ -1,7 +1,3 @@ -package org.apache.lucene.analysis.lv; - -import static org.apache.lucene.analysis.util.StemmerUtil.*; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,10 @@ import static org.apache.lucene.analysis.util.StemmerUtil.*; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.lv; + +import static org.apache.lucene.analysis.util.StemmerUtil.*; + /** * Light stemmer for Latvian. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/lv/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/lv/package-info.java index ffeb9be0326..ca266867f00 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/lv/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/lv/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analyzer for Latvian. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ASCIIFoldingFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ASCIIFoldingFilter.java index e289a5b5572..bd8d571e41f 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ASCIIFoldingFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ASCIIFoldingFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ASCIIFoldingFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ASCIIFoldingFilterFactory.java index 464fe614ac6..60dddff6bd2 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ASCIIFoldingFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ASCIIFoldingFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/CapitalizationFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/CapitalizationFilter.java index 76ce6952e98..d14ad44215c 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/CapitalizationFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/CapitalizationFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import java.io.IOException; import java.util.Collection; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/CapitalizationFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/CapitalizationFilterFactory.java index f65c66d185d..0301fa57ee7 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/CapitalizationFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/CapitalizationFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.util.CharArraySet; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/CodepointCountFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/CodepointCountFilter.java index 8e1726fb5ce..40cd210ea8d 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/CodepointCountFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/CodepointCountFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.util.FilteringTokenFilter; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/CodepointCountFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/CodepointCountFilterFactory.java index d42d7f6452f..c5e0391b949 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/CodepointCountFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/CodepointCountFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/DateRecognizerFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/DateRecognizerFilter.java index 52763f45ecf..df82ff1bb1e 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/DateRecognizerFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/DateRecognizerFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import java.text.DateFormat; import java.text.ParseException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/DateRecognizerFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/DateRecognizerFilterFactory.java index 7f02b8751b1..eec191dfaa3 100755 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/DateRecognizerFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/DateRecognizerFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import java.text.DateFormat; import java.text.SimpleDateFormat; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/EmptyTokenStream.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/EmptyTokenStream.java index 6b2b2db17c9..b2f3b649765 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/EmptyTokenStream.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/EmptyTokenStream.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import org.apache.lucene.analysis.TokenStream; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/FingerprintFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/FingerprintFilter.java index fa451d406a5..4c8a5c7b3df 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/FingerprintFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/FingerprintFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import java.io.IOException; import java.util.Arrays; import java.util.Comparator; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/FingerprintFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/FingerprintFilterFactory.java index b4337778acb..4c32ea9a72c 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/FingerprintFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/FingerprintFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/HyphenatedWordsFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/HyphenatedWordsFilter.java index 8f04ec0f14b..6c53aa3eef8 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/HyphenatedWordsFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/HyphenatedWordsFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/HyphenatedWordsFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/HyphenatedWordsFilterFactory.java index fb905fd16fd..4df514e6553 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/HyphenatedWordsFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/HyphenatedWordsFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeepWordFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeepWordFilter.java index 093d22b60b9..cb3e3310c23 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeepWordFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeepWordFilter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.miscellaneous; import org.apache.lucene.analysis.TokenStream; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeepWordFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeepWordFilterFactory.java index 7d4c24e0968..7ff7834b804 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeepWordFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeepWordFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.util.CharArraySet; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeywordMarkerFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeywordMarkerFilter.java index 924c44acabb..377d9c3a0f7 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeywordMarkerFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeywordMarkerFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeywordMarkerFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeywordMarkerFilterFactory.java index d395c7b984c..69c1aad2c74 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeywordMarkerFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeywordMarkerFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import java.io.IOException; import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeywordRepeatFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeywordRepeatFilter.java index d62998fe5a6..5de2b6719c5 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeywordRepeatFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeywordRepeatFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeywordRepeatFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeywordRepeatFilterFactory.java index ff46ca21877..24141359e9e 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeywordRepeatFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/KeywordRepeatFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LengthFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LengthFilter.java index bd7e2232023..0594c63f9a0 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LengthFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LengthFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.util.FilteringTokenFilter; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LengthFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LengthFilterFactory.java index 476f37543ea..4e1ec6ba932 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LengthFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LengthFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountAnalyzer.java index 570c9a2ce1d..ca90dfc16b6 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.AnalyzerWrapper; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountFilter.java index aa301dc0b89..80c1e34e9de 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountFilterFactory.java index aa157f02f7d..e354df5ea37 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenOffsetFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenOffsetFilter.java index a93e5691732..b2c4723dc0c 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenOffsetFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenOffsetFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenOffsetFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenOffsetFilterFactory.java index 778805ccf80..96e2a438810 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenOffsetFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenOffsetFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenPositionFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenPositionFilter.java index d1596a5076e..7547e472dce 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenPositionFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenPositionFilter.java @@ -1,4 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenPositionFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenPositionFilterFactory.java index 8cb657f8c52..2ebb34c296f 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenPositionFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenPositionFilterFactory.java @@ -1,4 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PatternKeywordMarkerFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PatternKeywordMarkerFilter.java index 2e055bbdbb7..5660e37a662 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PatternKeywordMarkerFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PatternKeywordMarkerFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PerFieldAnalyzerWrapper.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PerFieldAnalyzerWrapper.java index 5c03cdcc2b1..2d9b1da1557 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PerFieldAnalyzerWrapper.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PerFieldAnalyzerWrapper.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.DelegatingAnalyzerWrapper; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PrefixAndSuffixAwareTokenFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PrefixAndSuffixAwareTokenFilter.java index 84fda6dc4b4..ee669e02ac3 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PrefixAndSuffixAwareTokenFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PrefixAndSuffixAwareTokenFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenStream; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PrefixAwareTokenFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PrefixAwareTokenFilter.java index 99fa87e7656..cb866bdd3db 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PrefixAwareTokenFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PrefixAwareTokenFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenStream; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/RemoveDuplicatesTokenFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/RemoveDuplicatesTokenFilter.java index a1785abcf73..a7ef58e0da6 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/RemoveDuplicatesTokenFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/RemoveDuplicatesTokenFilter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.miscellaneous; import org.apache.lucene.analysis.TokenFilter; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/RemoveDuplicatesTokenFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/RemoveDuplicatesTokenFilterFactory.java index 47c1ba02602..ee0a0c91594 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/RemoveDuplicatesTokenFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/RemoveDuplicatesTokenFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ScandinavianFoldingFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ScandinavianFoldingFilter.java index 9d4cfaf1034..7d3d604b4b5 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ScandinavianFoldingFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ScandinavianFoldingFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ScandinavianFoldingFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ScandinavianFoldingFilterFactory.java index ffde2466539..6f2ae12f78b 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ScandinavianFoldingFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ScandinavianFoldingFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.util.TokenFilterFactory; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ScandinavianNormalizationFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ScandinavianNormalizationFilter.java index 137d2808ef4..8c2b131324d 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ScandinavianNormalizationFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ScandinavianNormalizationFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ScandinavianNormalizationFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ScandinavianNormalizationFilterFactory.java index 01ef9e24600..1873c8d6786 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ScandinavianNormalizationFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ScandinavianNormalizationFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.util.TokenFilterFactory; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/SetKeywordMarkerFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/SetKeywordMarkerFilter.java index bd5df3c936e..c4dbf7863ad 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/SetKeywordMarkerFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/SetKeywordMarkerFilter.java @@ -1,4 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.KeywordAttribute; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/StemmerOverrideFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/StemmerOverrideFilter.java index 1b173884cd7..e78137ec669 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/StemmerOverrideFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/StemmerOverrideFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/StemmerOverrideFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/StemmerOverrideFilterFactory.java index 450af5c56e5..87f6a85cb50 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/StemmerOverrideFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/StemmerOverrideFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import java.io.IOException; import java.util.List; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/TrimFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/TrimFilter.java index 20803202c77..55ce6f003fe 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/TrimFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/TrimFilter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.miscellaneous; import org.apache.lucene.analysis.TokenFilter; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/TrimFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/TrimFilterFactory.java index 58c400b9bd6..aa3e8bd3693 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/TrimFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/TrimFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilter.java index 63e4cc08665..5c9304ee5dc 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilterFactory.java index af3e40c93ca..7968036c16d 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/TruncateTokenFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.util.TokenFilterFactory; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilter.java index 4fa26400560..e2e7074be2a 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilter.java @@ -13,8 +13,7 @@ * 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.analysis.miscellaneous; import org.apache.lucene.analysis.TokenFilter; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilterFactory.java index a7bd468672f..a7e58bfc57c 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterIterator.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterIterator.java index faa8b4c6c6d..0367dab69ad 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterIterator.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/WordDelimiterIterator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import static org.apache.lucene.analysis.miscellaneous.WordDelimiterFilter.*; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/package-info.java index 200ed6fb75f..297d1a54c29 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Miscellaneous Tokenstreams. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramFilterFactory.java index fddf7cd792e..020b85bb5e9 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ngram; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ngram; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ngram; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenFilter.java index ed6db2e049a..2c10778b45e 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ngram; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ngram; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ngram; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenizer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenizer.java index 796aca3df26..5356c9a2194 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenizer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenizer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ngram; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ngram; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ngram; + import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.util.AttributeFactory; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerFactory.java index c751fcd8656..fcdcd4daba4 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ngram; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ngram; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ngram; + import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.util.TokenizerFactory; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramFilterFactory.java index 9626da416b0..2064716b78b 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ngram; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ngram; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ngram; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenFilter.java index e67349984eb..5a84bffa030 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ngram; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ngram; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ngram; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenizer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenizer.java index 0c6668cde5c..1c8aa7c01b3 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenizer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenizer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ngram; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ngram; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ngram; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenizerFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenizerFactory.java index b48a54bb4a0..e50e03affc8 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenizerFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/NGramTokenizerFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ngram; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ngram; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ngram; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/package-info.java index 3571be258b6..2884eb5a093 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Character n-gram tokenizers and filters. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/nl/DutchAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/nl/DutchAnalyzer.java index a9b54098747..e9550679972 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/nl/DutchAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/nl/DutchAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.nl; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.nl; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.nl; + import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.core.LowerCaseFilter; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/nl/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/nl/package-info.java index e62f8c78b23..cc622ad4734 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/nl/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/nl/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analyzer for Dutch. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianAnalyzer.java index 0dd81255964..4110da3dc84 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.no; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.no; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.no; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianLightStemFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianLightStemFilter.java index 311c8505de3..d3b5054ff56 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianLightStemFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianLightStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.no; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.no; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.no; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianLightStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianLightStemFilterFactory.java index 3446825da4b..0a5122ba7c0 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianLightStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianLightStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.no; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.no; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.no; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianLightStemmer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianLightStemmer.java index d18de325b5b..078473c1772 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianLightStemmer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianLightStemmer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.no; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.no; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.no; + /* * This algorithm is updated based on code located at: diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianMinimalStemFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianMinimalStemFilter.java index 9d4fcfb6b0d..b19f84667a5 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianMinimalStemFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianMinimalStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.no; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.no; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.no; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianMinimalStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianMinimalStemFilterFactory.java index 14a06a7d1db..1677272ba0b 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianMinimalStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianMinimalStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.no; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.no; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.no; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianMinimalStemmer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianMinimalStemmer.java index bc085480590..cdf0ba0a03f 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianMinimalStemmer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/NorwegianMinimalStemmer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.no; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.no; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.no; + /* * This algorithm is updated based on code located at: diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/package-info.java index 9d162ca5fd6..386f8f5e5fd 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analyzer for Norwegian. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/path/PathHierarchyTokenizer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/path/PathHierarchyTokenizer.java index d61632187f3..251884e59a9 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/path/PathHierarchyTokenizer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/path/PathHierarchyTokenizer.java @@ -1,4 +1,3 @@ -package org.apache.lucene.analysis.path; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.analysis.path; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.path; import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/path/PathHierarchyTokenizerFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/path/PathHierarchyTokenizerFactory.java index 17c834acca0..bdcc68edf76 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/path/PathHierarchyTokenizerFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/path/PathHierarchyTokenizerFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.path; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.path; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.path; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/path/ReversePathHierarchyTokenizer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/path/ReversePathHierarchyTokenizer.java index 03c86b791b3..a9f3e0ad440 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/path/ReversePathHierarchyTokenizer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/path/ReversePathHierarchyTokenizer.java @@ -1,4 +1,3 @@ -package org.apache.lucene.analysis.path; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.analysis.path; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.path; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/path/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/path/package-info.java index 0482a7f8121..70d52627272 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/path/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/path/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analysis components for path-like strings such as filenames. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternCaptureGroupFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternCaptureGroupFilterFactory.java index 4ba68ab4b22..ea8cd422b1d 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternCaptureGroupFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternCaptureGroupFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.pattern; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.pattern; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.pattern; + import java.util.Map; import java.util.regex.Pattern; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternCaptureGroupTokenFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternCaptureGroupTokenFilter.java index a920608a75c..5563c233e37 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternCaptureGroupTokenFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternCaptureGroupTokenFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.pattern; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.pattern; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.pattern; + import java.io.IOException; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceCharFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceCharFilter.java index 398f67bcb66..971a7348040 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceCharFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceCharFilter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.pattern; import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceCharFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceCharFilterFactory.java index a0f3de11db9..70e97285977 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceCharFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceCharFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.pattern; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.pattern; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.pattern; + import java.io.Reader; import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceFilter.java index 437e87ca0e0..5e3ff114c87 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceFilter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.pattern; import org.apache.lucene.analysis.TokenFilter; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceFilterFactory.java index dc7609d8da7..57e5e11f97c 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.pattern; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.pattern; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.pattern; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.util.TokenFilterFactory; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternTokenizer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternTokenizer.java index e25a7b9f1a1..4dabf24bdd9 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternTokenizer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternTokenizer.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.pattern; import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternTokenizerFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternTokenizerFactory.java index 42ea0224cf6..b919daed550 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternTokenizerFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternTokenizerFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.pattern; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.pattern; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.pattern; + import java.util.Map; import java.util.regex.Pattern; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/package-info.java index e9d49cfafa6..8b3dd82335e 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Set of components for pattern-based (regex) analysis. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/AbstractEncoder.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/AbstractEncoder.java index f7ddd55d6fa..30c348eea9a 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/AbstractEncoder.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/AbstractEncoder.java @@ -1,7 +1,3 @@ -package org.apache.lucene.analysis.payloads; - -import org.apache.lucene.util.BytesRef; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,10 @@ import org.apache.lucene.util.BytesRef; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.payloads; + +import org.apache.lucene.util.BytesRef; + diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilter.java index cf597175bf0..e3bdfbdff2d 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilter.java @@ -1,4 +1,3 @@ -package org.apache.lucene.analysis.payloads; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.analysis.payloads; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.payloads; import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilterFactory.java index d56f11ac223..02964db6ce2 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.payloads; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.payloads; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.payloads; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.util.ResourceLoader; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/FloatEncoder.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/FloatEncoder.java index 41ced042055..f94e0a0eec9 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/FloatEncoder.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/FloatEncoder.java @@ -1,7 +1,3 @@ -package org.apache.lucene.analysis.payloads; - -import org.apache.lucene.util.BytesRef; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,10 @@ import org.apache.lucene.util.BytesRef; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.payloads; + +import org.apache.lucene.util.BytesRef; + /** * Encode a character array Float as a {@link BytesRef}. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/IdentityEncoder.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/IdentityEncoder.java index 721ecbffd0a..a60d2a252c0 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/IdentityEncoder.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/IdentityEncoder.java @@ -1,4 +1,3 @@ -package org.apache.lucene.analysis.payloads; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.analysis.payloads; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.payloads; import java.nio.ByteBuffer; import java.nio.CharBuffer; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/IntegerEncoder.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/IntegerEncoder.java index a6228f4e3d7..8713912df9c 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/IntegerEncoder.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/IntegerEncoder.java @@ -1,4 +1,3 @@ -package org.apache.lucene.analysis.payloads; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.analysis.payloads; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.payloads; import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilter.java index 54c356ebb53..9f9eec62fde 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilter.java @@ -1,4 +1,3 @@ -package org.apache.lucene.analysis.payloads; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.analysis.payloads; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.payloads; import org.apache.lucene.analysis.TokenFilter; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterFactory.java index 089a4b7cf40..98783b07c5b 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.payloads; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.payloads; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.payloads; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.util.TokenFilterFactory; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/PayloadEncoder.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/PayloadEncoder.java index 11eb2a9392d..9798ce43686 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/PayloadEncoder.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/PayloadEncoder.java @@ -1,7 +1,3 @@ -package org.apache.lucene.analysis.payloads; - -import org.apache.lucene.util.BytesRef; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,10 @@ import org.apache.lucene.util.BytesRef; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.payloads; + +import org.apache.lucene.util.BytesRef; + /** diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/PayloadHelper.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/PayloadHelper.java index f7c57bf1a6d..e21478e51b9 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/PayloadHelper.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/PayloadHelper.java @@ -1,4 +1,3 @@ -package org.apache.lucene.analysis.payloads; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.analysis.payloads; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.payloads; /** diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilter.java index 5d808c085b3..91dd1b03491 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilter.java @@ -1,4 +1,3 @@ -package org.apache.lucene.analysis.payloads; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.analysis.payloads; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.payloads; import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilterFactory.java index 11628183754..56c38da57cb 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.payloads; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.payloads; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.payloads; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilter.java index e513f600906..92fc76a8d73 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilter.java @@ -1,4 +1,3 @@ -package org.apache.lucene.analysis.payloads; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.analysis.payloads; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.payloads; import org.apache.lucene.analysis.TokenFilter; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterFactory.java index 43a3e83cbab..a0c598962e6 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.payloads; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.payloads; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.payloads; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/package-info.java index f7b77318030..411d1e48b96 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Provides various convenience classes for creating payloads on Tokens. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseAnalyzer.java index fde61d6fa8c..ecdb944f46c 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.pt; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.pt; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.pt; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseLightStemFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseLightStemFilter.java index 47779a0f06f..5dda3f7f9eb 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseLightStemFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseLightStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.pt; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.pt; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.pt; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseLightStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseLightStemFilterFactory.java index e7532393147..479c2fd0daa 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseLightStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseLightStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.pt; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.pt; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.pt; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseLightStemmer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseLightStemmer.java index aa60f5d410a..50edc8a849f 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseLightStemmer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseLightStemmer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.pt; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.pt; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.pt; + /* * This algorithm is updated based on code located at: diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseMinimalStemFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseMinimalStemFilter.java index d0be82bac07..202ea3c4e9e 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseMinimalStemFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseMinimalStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.pt; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.pt; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.pt; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseMinimalStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseMinimalStemFilterFactory.java index 73174a0e99f..d78236658ed 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseMinimalStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseMinimalStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.pt; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.pt; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.pt; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseMinimalStemmer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseMinimalStemmer.java index b1796a06720..202ce9fa40a 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseMinimalStemmer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseMinimalStemmer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.pt; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.pt; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.pt; + /** * Minimal Stemmer for Portuguese diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseStemFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseStemFilter.java index 19f605b7025..726c53a7262 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseStemFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.pt; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.pt; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.pt; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseStemFilterFactory.java index 355dc76d4a0..cccfea33fe8 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.pt; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.pt; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.pt; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseStemmer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseStemmer.java index a03e7d121f5..24b5d21783a 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseStemmer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/PortugueseStemmer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.pt; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.pt; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.pt; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/RSLPStemmerBase.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/RSLPStemmerBase.java index 54ecdff15f2..f24cf2a6e6d 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/RSLPStemmerBase.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/RSLPStemmerBase.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.pt; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.pt; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.pt; + import java.io.IOException; import java.io.InputStream; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/package-info.java index 1f8caa960f6..e352eb32e31 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analyzer for Portuguese. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java index 52e5ee4c032..3ba79270966 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java @@ -1,4 +1,3 @@ -package org.apache.lucene.analysis.query; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.analysis.query; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.query; import java.io.IOException; import java.util.*; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/query/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/query/package-info.java index 11b89a4bd8e..c4cd7ab914c 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/query/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/query/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Automatically filter high-frequency stopwords. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/reverse/ReverseStringFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/reverse/ReverseStringFilter.java index 9e3e3d57469..b2e23585ec7 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/reverse/ReverseStringFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/reverse/ReverseStringFilter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.reverse; import org.apache.lucene.analysis.TokenFilter; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/reverse/ReverseStringFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/reverse/ReverseStringFilterFactory.java index 33cfc97fb5d..310fc9162ec 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/reverse/ReverseStringFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/reverse/ReverseStringFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.reverse; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.reverse; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.reverse; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/reverse/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/reverse/package-info.java index d0b46f8a3bb..2e636494131 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/reverse/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/reverse/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Filter to reverse token text. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ro/RomanianAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ro/RomanianAnalyzer.java index cca18c6ecc5..74362437b2e 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ro/RomanianAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ro/RomanianAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ro; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ro; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ro; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ro/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ro/package-info.java index 9b7426bd0b0..7e340fdae5d 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ro/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ro/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analyzer for Romanian. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianAnalyzer.java index 7dd1406aebf..db2df8a4a72 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ru; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ru; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ru; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianLightStemFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianLightStemFilter.java index 5efe1ea4eca..c08a1e8b0a4 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianLightStemFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianLightStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ru; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ru; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ru; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianLightStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianLightStemFilterFactory.java index 8f4fca83d01..e71f5af306c 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianLightStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianLightStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ru; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ru; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ru; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianLightStemmer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianLightStemmer.java index b2554739a54..426846708e9 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianLightStemmer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ru/RussianLightStemmer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ru; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ru; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ru; + /* * This algorithm is updated based on code located at: diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ru/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ru/package-info.java index 597b80f3ec4..5901307272f 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ru/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ru/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analyzer for Russian. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapper.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapper.java index cd2e3353f38..fb580cfa8a2 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapper.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapper.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.shingle; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.shingle; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.shingle; + import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.AnalyzerWrapper; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilter.java index c5de5e64c6a..5d992919999 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.shingle; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.shingle; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.shingle; + import java.io.IOException; import java.util.Iterator; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilterFactory.java index df1b6fbaa6f..c6b1519b96b 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.shingle; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.shingle; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.shingle; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.util.TokenFilterFactory; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/package-info.java index b90b982e940..625bea35e72 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Word n-gram filters. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/sinks/TeeSinkTokenFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/sinks/TeeSinkTokenFilter.java index 5c30c590cf6..ca51fd97f1c 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/sinks/TeeSinkTokenFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/sinks/TeeSinkTokenFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.sinks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.sinks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.sinks; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/sinks/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/sinks/package-info.java index 964e5f43aaa..a222837b7a8 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/sinks/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/sinks/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * {@link org.apache.lucene.analysis.sinks.TeeSinkTokenFilter}. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballFilter.java index eacb43e2eec..1c11e48af03 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.snowball; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.snowball; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.snowball; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballPorterFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballPorterFilterFactory.java index b9eb8e892f7..93cf7a472d0 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballPorterFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/snowball/SnowballPorterFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.snowball; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.snowball; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.snowball; + import java.util.Map; import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/snowball/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/snowball/package-info.java index c01d6f195b5..7ad67d1a82d 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/snowball/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/snowball/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * {@link org.apache.lucene.analysis.TokenFilter} and {@link * org.apache.lucene.analysis.Analyzer} implementations that use Snowball diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/sr/SerbianNormalizationFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/sr/SerbianNormalizationFilter.java index 15c58d66b90..91abe29d703 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/sr/SerbianNormalizationFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/sr/SerbianNormalizationFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.sr; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.sr; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.sr; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/sr/SerbianNormalizationFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/sr/SerbianNormalizationFilterFactory.java index bcf67df2c4d..bd924f0cbbc 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/sr/SerbianNormalizationFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/sr/SerbianNormalizationFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.sr; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.sr; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.sr; + import java.util.Arrays; import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/sr/SerbianNormalizationRegularFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/sr/SerbianNormalizationRegularFilter.java index a0800cf7785..f775b78dda9 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/sr/SerbianNormalizationRegularFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/sr/SerbianNormalizationRegularFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.sr; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.sr; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.sr; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/sr/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/sr/package-info.java index b67d83f8625..f900abb3f86 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/sr/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/sr/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analyzer for Serbian. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicAnalyzer.java index 26816064a5f..43c7dade940 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.standard; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.standard; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.standard; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicFilter.java index 054b9c404cf..5d5baec5a58 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.standard; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.standard; * 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.TokenFilter; import org.apache.lucene.analysis.TokenStream; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicFilterFactory.java index f177eaf8ae5..33b0a941db1 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.standard; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.standard; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.standard; + import java.util.Map; 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 339ab8bb116..76b1ef640c4 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,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.standard; import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerFactory.java index e4d901b82ba..b2a713483f3 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.standard; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.standard; * 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.util.TokenizerFactory; import org.apache.lucene.util.AttributeFactory; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java index 6578ee25bd8..48365ff28b8 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java @@ -1,7 +1,5 @@ /* The following code was generated by JFlex 1.6.0 */ -package org.apache.lucene.analysis.standard; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +16,7 @@ package org.apache.lucene.analysis.standard; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.standard; import java.io.Reader; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; 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 cb9b1a68311..de65d26247a 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 @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.standard; - /* * 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.lucene.analysis.standard; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.standard; import java.io.Reader; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardAnalyzer.java index 54e26dd9f0c..ae23dc604aa 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.standard; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.standard; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.standard; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardFilter.java index ae5be75bc1e..a470a830098 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.standard; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.standard; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.standard; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardFilterFactory.java index f9102b00b44..ac9e6eaaf4a 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.standard; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.standard; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.standard; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java index 1da20400bdb..1e143a3dc7c 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.standard; import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerFactory.java index 87709aa8622..c74c55ca9b7 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.standard; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.standard; * 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.util.TokenizerFactory; import org.apache.lucene.util.AttributeFactory; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java index 8d6aeb5e311..c8bf9e9526d 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java @@ -1,7 +1,5 @@ /* The following code was generated by JFlex 1.6.0 */ -package org.apache.lucene.analysis.standard; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +16,7 @@ package org.apache.lucene.analysis.standard; * 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; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex index c89ffa87903..34f4eade3fc 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.standard; - /* * 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.lucene.analysis.standard; * 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; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailAnalyzer.java index 1a699e5bd10..1fc2d7c8b34 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.standard; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.standard; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.standard; + import java.io.IOException; import java.io.Reader; 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 741a7d66ae5..03de0329be5 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 @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.standard; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.standard; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.standard; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerFactory.java index 485b7d33a6e..ee0bf45e133 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.standard; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.standard; * 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.util.TokenizerFactory; import org.apache.lucene.util.AttributeFactory; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.java index 9ef2870826f..a2e262b7723 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.java @@ -1,7 +1,5 @@ /* The following code was generated by JFlex 1.6.0 */ -package org.apache.lucene.analysis.standard; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +16,7 @@ package org.apache.lucene.analysis.standard; * 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; 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 5af3888a4b4..32af6317827 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 @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.standard; - /* * 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.lucene.analysis.standard; * 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; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/package-info.java index afc68ce973f..7c45b4bb772 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Fast, general-purpose grammar-based tokenizers. *

The org.apache.lucene.analysis.standard package contains three diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/sv/SwedishAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/sv/SwedishAnalyzer.java index e47e7f8c55c..fd15bbd60d1 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/sv/SwedishAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/sv/SwedishAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.sv; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.sv; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.sv; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/sv/SwedishLightStemFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/sv/SwedishLightStemFilter.java index bcd91bcb728..d6ff3a10ab7 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/sv/SwedishLightStemFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/sv/SwedishLightStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.sv; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.sv; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.sv; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/sv/SwedishLightStemFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/sv/SwedishLightStemFilterFactory.java index 0c4a0617eb4..2e0bd52e6a6 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/sv/SwedishLightStemFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/sv/SwedishLightStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.sv; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.sv; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.sv; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/sv/SwedishLightStemmer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/sv/SwedishLightStemmer.java index 64c5e1d7bb2..5c752585868 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/sv/SwedishLightStemmer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/sv/SwedishLightStemmer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.sv; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.sv; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.sv; + /* * This algorithm is updated based on code located at: diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/sv/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/sv/package-info.java index 1a10b3c2ab8..06c8f300def 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/sv/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/sv/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analyzer for Swedish. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SolrSynonymParser.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SolrSynonymParser.java index 18980896c28..257d6054bc3 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SolrSynonymParser.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SolrSynonymParser.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.synonym; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.synonym; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.synonym; + import java.io.BufferedReader; import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilter.java index af656b6b9d8..8b298f79f99 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.synonym; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.synonym; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.synonym; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilterFactory.java index d7dbd0f2309..b9c55293802 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.synonym; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.synonym; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.synonym; + import java.io.IOException; import java.io.InputStreamReader; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymMap.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymMap.java index 0fedd4ee027..fea5b69a7fa 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymMap.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymMap.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.synonym; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.synonym; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.synonym; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/WordnetSynonymParser.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/WordnetSynonymParser.java index 42fa96476bd..b74e37185d3 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/WordnetSynonymParser.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/WordnetSynonymParser.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.synonym; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.synonym; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.synonym; + import java.io.IOException; import java.io.LineNumberReader; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/package-info.java index a8b33c2193f..af1a145c711 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analysis components for Synonyms. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java index 4bc0b89dcef..3f2e52a2ec7 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiAnalyzer.java @@ -1,11 +1,10 @@ -package org.apache.lucene.analysis.th; - /* - * Copyright 2006 The Apache Software Foundation - * - * Licensed 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 + * 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 * @@ -15,6 +14,7 @@ package org.apache.lucene.analysis.th; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.th; import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiTokenizer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiTokenizer.java index 6fbfb7821ea..53f71699f2f 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiTokenizer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiTokenizer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.th; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.th; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.th; + import java.text.BreakIterator; import java.util.Locale; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiTokenizerFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiTokenizerFactory.java index 05121c3c3c7..a941c88c278 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiTokenizerFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/ThaiTokenizerFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.th; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.th; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.th; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/package-info.java index 74dcc7740a8..9f55c1c922c 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analyzer for Thai. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/ApostropheFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/ApostropheFilter.java index 8695da7e5f4..58a25f97974 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/ApostropheFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/ApostropheFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.tr; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.tr; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.tr; + import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/ApostropheFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/ApostropheFilterFactory.java index df9f0742129..2eaee9c0479 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/ApostropheFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/ApostropheFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.tr; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.tr; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.tr; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.util.TokenFilterFactory; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishAnalyzer.java index 2cc5575ab20..539b203c6ac 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.tr; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.tr; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.tr; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishLowerCaseFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishLowerCaseFilter.java index 3578bdf5325..c4e47824d5a 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishLowerCaseFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishLowerCaseFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.tr; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.tr; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.tr; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishLowerCaseFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishLowerCaseFilterFactory.java index e789883f3a7..0c7a8c0edd3 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishLowerCaseFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/TurkishLowerCaseFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.tr; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.tr; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.tr; + import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/package-info.java index 564ef0c441a..44e70fe129a 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analyzer for Turkish. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/AbstractAnalysisFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/AbstractAnalysisFactory.java index bc48531ae5a..8ee809c91a9 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/AbstractAnalysisFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/AbstractAnalysisFactory.java @@ -1,5 +1,3 @@ -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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.util; + import java.io.IOException; import java.io.InputStream; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/AnalysisSPILoader.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/AnalysisSPILoader.java index 997f332d976..8dacf634233 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/AnalysisSPILoader.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/AnalysisSPILoader.java @@ -1,5 +1,3 @@ -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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.util; + import java.lang.reflect.InvocationTargetException; import java.util.Arrays; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharArrayIterator.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharArrayIterator.java index 3ec213f97ab..16c1466ca2b 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharArrayIterator.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharArrayIterator.java @@ -1,5 +1,3 @@ -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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.util; + import java.text.BreakIterator; // javadoc import java.text.CharacterIterator; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharArrayMap.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharArrayMap.java index 7529d93d8df..289ee0871da 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharArrayMap.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharArrayMap.java @@ -1,5 +1,3 @@ -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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.util; + import java.util.Arrays; import java.util.AbstractMap; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharArraySet.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharArraySet.java index 4b9b264eef5..15485bc49be 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharArraySet.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharArraySet.java @@ -1,5 +1,3 @@ -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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.util; + import java.util.AbstractSet; import java.util.Collection; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharFilterFactory.java index fb832886247..4c0df29066e 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharFilterFactory.java @@ -1,5 +1,3 @@ -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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.util; + import java.io.Reader; import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharTokenizer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharTokenizer.java index dc55ddaeeb3..768323903c8 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharTokenizer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharTokenizer.java @@ -1,5 +1,3 @@ -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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.util; + import java.io.IOException; import java.util.Objects; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharacterUtils.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharacterUtils.java index b864ca20c51..f14b1f77d53 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharacterUtils.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/CharacterUtils.java @@ -1,5 +1,3 @@ -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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.util; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ClasspathResourceLoader.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ClasspathResourceLoader.java index 7e5d1995884..3653e7f5ffe 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ClasspathResourceLoader.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ClasspathResourceLoader.java @@ -1,5 +1,3 @@ -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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.util; + import java.io.IOException; import java.io.InputStream; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ElisionFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ElisionFilter.java index c04d28760ad..d7689f97796 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ElisionFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ElisionFilter.java @@ -1,5 +1,3 @@ -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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.util; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ElisionFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ElisionFilterFactory.java index d77e98c26c8..31c30276eb7 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ElisionFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ElisionFilterFactory.java @@ -1,5 +1,3 @@ -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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.util; + import java.io.IOException; import java.util.Map; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/FilesystemResourceLoader.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/FilesystemResourceLoader.java index de7cfa0b1d7..39703865029 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/FilesystemResourceLoader.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/FilesystemResourceLoader.java @@ -1,5 +1,3 @@ -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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.util; + import java.io.FileNotFoundException; import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/FilteringTokenFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/FilteringTokenFilter.java index f030475f8e2..97d35e25414 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/FilteringTokenFilter.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/FilteringTokenFilter.java @@ -1,5 +1,3 @@ -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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.util; + import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/MultiTermAwareComponent.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/MultiTermAwareComponent.java index 59e3ff7b691..700da3cce1e 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/MultiTermAwareComponent.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/MultiTermAwareComponent.java @@ -1,5 +1,3 @@ -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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.util; + /** Add to any analysis factory component to allow returning an * analysis component factory for use with partial terms in prefix queries, diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/OpenStringBuilder.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/OpenStringBuilder.java index d8c428cd42f..57cb91a5e62 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/OpenStringBuilder.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/OpenStringBuilder.java @@ -1,5 +1,3 @@ -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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.util; + /** * A StringBuilder that allows one to access the array. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceLoader.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceLoader.java index 37c1706f61e..3f5bbd35082 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceLoader.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceLoader.java @@ -1,5 +1,3 @@ -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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.util; + import java.io.IOException; import java.io.InputStream; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceLoaderAware.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceLoaderAware.java index 7ac18b60f3c..504c33a5c0f 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceLoaderAware.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/ResourceLoaderAware.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.util; import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/RollingCharBuffer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/RollingCharBuffer.java index 39b63b48c4b..1ced960df57 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/RollingCharBuffer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/RollingCharBuffer.java @@ -1,5 +1,3 @@ -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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.util; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/SegmentingTokenizerBase.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/SegmentingTokenizerBase.java index 0020b1db292..41c49f7e868 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/SegmentingTokenizerBase.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/SegmentingTokenizerBase.java @@ -1,5 +1,3 @@ -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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.util; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/StemmerUtil.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/StemmerUtil.java index 6222d476cde..2b7e949b0ad 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/StemmerUtil.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/StemmerUtil.java @@ -1,5 +1,3 @@ -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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.util; + /** * Some commonly-used stemming functions diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/StopwordAnalyzerBase.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/StopwordAnalyzerBase.java index ad7332bcf61..fc6c79839f9 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/StopwordAnalyzerBase.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/StopwordAnalyzerBase.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.util; import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/TokenFilterFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/TokenFilterFactory.java index 12cb556e725..7eec6ddd7bc 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/TokenFilterFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/TokenFilterFactory.java @@ -1,5 +1,3 @@ -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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.util; + import java.util.Map; import java.util.Set; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/TokenizerFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/TokenizerFactory.java index 0952d9c8f18..8e2d64a8501 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/TokenizerFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/TokenizerFactory.java @@ -1,5 +1,3 @@ -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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.util; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/WordlistLoader.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/WordlistLoader.java index 91f28f4358d..4d999655b5c 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/WordlistLoader.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/WordlistLoader.java @@ -1,5 +1,3 @@ -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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.util; + import java.io.BufferedReader; import java.io.IOException; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/package-info.java index 771ddf3e77b..a2afac8475e 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Utility functions for text analysis. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizer.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizer.java index 07793803338..ead4e35deed 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizer.java @@ -14,7 +14,6 @@ * 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.Tokenizer; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerFactory.java index b0dbba08fae..3a570967c8f 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.wikipedia; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.wikipedia; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.wikipedia; + import java.util.Collections; import java.util.Map; 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 ee8a36ae588..337a5628e74 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 @@ -1,7 +1,5 @@ /* The following code was generated by JFlex 1.6.0 */ -package org.apache.lucene.analysis.wikipedia; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +16,7 @@ package org.apache.lucene.analysis.wikipedia; * 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; 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 5293bbb850c..404fbd68469 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 @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.wikipedia; - /* * 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.lucene.analysis.wikipedia; * 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; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/package-info.java index 65708d80e09..1bfb36ac247 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Tokenizer that is aware of Wikipedia syntax. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/collation/CollationAttributeFactory.java b/lucene/analysis/common/src/java/org/apache/lucene/collation/CollationAttributeFactory.java index 64ece614e49..6de59c8ccea 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/collation/CollationAttributeFactory.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/collation/CollationAttributeFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.collation; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.collation; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.collation; + import java.text.Collator; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/collation/CollationDocValuesField.java b/lucene/analysis/common/src/java/org/apache/lucene/collation/CollationDocValuesField.java index d77f05a0512..507abfd075a 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/collation/CollationDocValuesField.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/collation/CollationDocValuesField.java @@ -1,5 +1,3 @@ -package org.apache.lucene.collation; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.collation; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.collation; + import java.text.Collator; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/collation/CollationKeyAnalyzer.java b/lucene/analysis/common/src/java/org/apache/lucene/collation/CollationKeyAnalyzer.java index e3b97d749b3..08501b968cc 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/collation/CollationKeyAnalyzer.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/collation/CollationKeyAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.collation; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.collation; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.collation; + import org.apache.lucene.analysis.Analyzer; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/collation/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/collation/package-info.java index 19a1c7ecd6d..e7c248f2f6f 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/collation/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/collation/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Unicode collation support. *

diff --git a/lucene/analysis/common/src/java/org/apache/lucene/collation/tokenattributes/CollatedTermAttributeImpl.java b/lucene/analysis/common/src/java/org/apache/lucene/collation/tokenattributes/CollatedTermAttributeImpl.java index e8f7076df23..d997505c6e9 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/collation/tokenattributes/CollatedTermAttributeImpl.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/collation/tokenattributes/CollatedTermAttributeImpl.java @@ -1,5 +1,3 @@ -package org.apache.lucene.collation.tokenattributes; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.collation.tokenattributes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.collation.tokenattributes; + import java.text.Collator; diff --git a/lucene/analysis/common/src/java/org/apache/lucene/collation/tokenattributes/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/collation/tokenattributes/package-info.java index eee13c4f74e..14742a239b3 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/collation/tokenattributes/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/collation/tokenattributes/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Custom {@link org.apache.lucene.util.AttributeImpl} for indexing collation keys as index terms. */ diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/package-info.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/package-info.java index 6d2d43b83e3..64bb5c1a3ac 100644 --- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/package-info.java +++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Autogenerated snowball stemmer implementations. */ diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/package-info.java b/lucene/analysis/common/src/java/org/tartarus/snowball/package-info.java index b335dc1b1dc..2e31343b79e 100644 --- a/lucene/analysis/common/src/java/org/tartarus/snowball/package-info.java +++ b/lucene/analysis/common/src/java/org/tartarus/snowball/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Snowball stemmer API */ diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicAnalyzer.java index 1881f8bc037..9842687632c 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ar; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ar; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ar; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicFilters.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicFilters.java index 547d7ca86ad..7bc9abc9b67 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicFilters.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicFilters.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ar; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ar; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ar; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicNormalizationFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicNormalizationFilter.java index b3ddfb0069b..03d13e3e75f 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicNormalizationFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicNormalizationFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ar; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ar; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ar; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicStemFilter.java index 09169bfc0e1..ca15485632d 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ar/TestArabicStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ar; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ar; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ar; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianAnalyzer.java index a5b82a87c04..7f890b98a23 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.bg; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.bg; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.bg; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemFilterFactory.java index d169311a3e0..7edd86bac23 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.bg; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.bg; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.bg; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemmer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemmer.java index 476c156900b..daad7bb509a 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemmer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/bg/TestBulgarianStemmer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.bg; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.bg; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.bg; + import java.io.IOException; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianAnalyzer.java index 23500d30d23..6158b33bb2c 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.br; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.br; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.br; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemFilterFactory.java index 6cce89419fb..b3257973285 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.br; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.br; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.br; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ca/TestCatalanAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ca/TestCatalanAnalyzer.java index 661f49aba2c..fd65332fa69 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ca/TestCatalanAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ca/TestCatalanAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ca; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ca; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ca; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/HTMLStripCharFilterTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/HTMLStripCharFilterTest.java index fb07ceea3d5..cf6c65ab557 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/HTMLStripCharFilterTest.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/HTMLStripCharFilterTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.charfilter; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.charfilter; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.charfilter; + import java.io.BufferedReader; import java.io.InputStream; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilterFactory.java index 1e9a4fd86c2..f3a0b710bde 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.charfilter; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.charfilter; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.charfilter; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilter.java index 40a845c060a..bb4ebc9ef60 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.charfilter; import java.io.Reader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilterFactory.java index 89fb6803315..b1c730f0eb6 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestMappingCharFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.charfilter; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.charfilter; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.charfilter; + import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKAnalyzer.java index 71a1a698fe0..72c510cb291 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.cjk; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.cjk; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.cjk; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKBigramFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKBigramFilter.java index 8f81756c7ee..35facbfe2f1 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKBigramFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKBigramFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.cjk; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.cjk; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.cjk; + import java.util.Random; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKBigramFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKBigramFilterFactory.java index 4e9c16b77fa..6828d5195f6 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKBigramFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKBigramFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.cjk; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.cjk; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.cjk; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthFilter.java index 0e6f2907cea..63e4fd79625 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.cjk; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.cjk; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.cjk; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthFilterFactory.java index 2f7c594b7cc..c9e80884f30 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cjk/TestCJKWidthFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.cjk; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.cjk; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.cjk; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniAnalyzer.java index 35aa20e86ca..d08817c5f6f 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ckb; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ckb; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ckb; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniNormalizationFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniNormalizationFilter.java index 4e8f3529694..096ef487851 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniNormalizationFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniNormalizationFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ckb; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ckb; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ckb; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniNormalizationFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniNormalizationFilterFactory.java index 7fe3e7bb592..b1027b29eea 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniNormalizationFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniNormalizationFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ckb; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ckb; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ckb; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniStemFilter.java index 1bae690595c..0d95033b7e9 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ckb; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ckb; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ckb; + import static org.apache.lucene.analysis.VocabularyAssert.assertVocabulary; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniStemFilterFactory.java index 0868a3955b5..384ea9e56e4 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ckb/TestSoraniStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ckb; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ckb; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ckb; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsFilterFactory.java index 3c369071d85..e1838b44ecf 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.commongrams; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.commongrams; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.commongrams; + import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsQueryFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsQueryFilterFactory.java index e5ea0a62534..8ed2e4070b3 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsQueryFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/commongrams/TestCommonGramsQueryFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.commongrams; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.commongrams; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.commongrams; + import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestCompoundWordTokenFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestCompoundWordTokenFilter.java index 4149c57e1c1..636d9ba77ac 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestCompoundWordTokenFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestCompoundWordTokenFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.compound; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.compound; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.compound; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestDictionaryCompoundWordTokenFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestDictionaryCompoundWordTokenFilterFactory.java index 8ba400eba53..76532aac929 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestDictionaryCompoundWordTokenFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestDictionaryCompoundWordTokenFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.compound; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.compound; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.compound; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestHyphenationCompoundWordTokenFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestHyphenationCompoundWordTokenFilterFactory.java index d8dee0e48df..31f65d33776 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestHyphenationCompoundWordTokenFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/compound/TestHyphenationCompoundWordTokenFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.compound; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.compound; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.compound; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestAllAnalyzersHaveFactories.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestAllAnalyzersHaveFactories.java index 559db2da4e6..f8874eb13e4 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestAllAnalyzersHaveFactories.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestAllAnalyzersHaveFactories.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.core; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestAnalyzers.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestAnalyzers.java index 2576b622f7d..97722030a37 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestAnalyzers.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestAnalyzers.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.core; + import java.io.IOException; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestBugInSomething.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestBugInSomething.java index 32d2c78834d..e69d5b859bd 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestBugInSomething.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestBugInSomething.java @@ -1,3 +1,19 @@ +/* + * 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.analysis.core; import java.io.IOException; @@ -27,22 +43,6 @@ import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.analysis.wikipedia.WikipediaTokenizer; import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; -/* - * 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. - */ @SuppressCodecs("Direct") public class TestBugInSomething extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDecimalDigitFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDecimalDigitFilter.java index e73319f2dbf..ae251936a5a 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDecimalDigitFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDecimalDigitFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.core; + import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.BaseTokenStreamTestCase; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDecimalDigitFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDecimalDigitFilterFactory.java index 1edccad5d58..112f009cf10 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDecimalDigitFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDecimalDigitFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.core; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDuelingAnalyzers.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDuelingAnalyzers.java index b76465e84f4..689d6832791 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDuelingAnalyzers.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestDuelingAnalyzers.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.core; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFactories.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFactories.java index 8150fda6e36..956a3941b78 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFactories.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFactories.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.core; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java index e03a5f238e6..d45b1e3caf8 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.core; + import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java index d218d891abd..5c2547182dd 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.core; + import java.io.IOException; import java.io.InputStream; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopAnalyzer.java index 36b5d416f2d..f7552c816b5 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.core; + import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilter.java index 1d6a96af792..25b89d9bc23 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilter.java @@ -1,11 +1,10 @@ -package org.apache.lucene.analysis.core; - /* - * Copyright 2005 The Apache Software Foundation - * - * Licensed 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 + * 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 * @@ -15,6 +14,7 @@ package org.apache.lucene.analysis.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.core; import java.io.IOException; import java.io.StringReader; @@ -29,7 +29,6 @@ import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.util.English; - public class TestStopFilter extends BaseTokenStreamTestCase { // other StopFilter functionality is already tested by TestStopAnalyzer diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilterFactory.java index db60696de8e..1d0aa8a0690 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStopFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.core; + import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.util.CharArraySet; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilter.java index 1f546cabb25..5f881d8958b 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.core; + import java.io.IOException; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilterFactory.java index 7fad96e724a..f7a1f62cfbf 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestTypeTokenFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.core; + import java.util.Set; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestUnicodeWhitespaceTokenizer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestUnicodeWhitespaceTokenizer.java index a9565fb64df..acdb670f7ea 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestUnicodeWhitespaceTokenizer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestUnicodeWhitespaceTokenizer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.core; + import java.io.IOException; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/custom/TestCustomAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/custom/TestCustomAnalyzer.java index cd564f7ce6c..86088c03998 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/custom/TestCustomAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/custom/TestCustomAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.custom; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.custom; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.custom; + import java.nio.file.Paths; import java.util.Collections; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechAnalyzer.java index a8505cb71d4..75ec3580085 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.cz; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.cz; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.cz; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemFilterFactory.java index aa797ce004d..81fbfc79f6a 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.cz; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.cz; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.cz; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemmer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemmer.java index 259e948bfe5..7463f1d579d 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemmer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechStemmer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.cz; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.cz; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.cz; + import java.io.IOException; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/da/TestDanishAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/da/TestDanishAnalyzer.java index 3df580020f5..918962bda55 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/da/TestDanishAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/da/TestDanishAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.da; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.da; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.da; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanAnalyzer.java index 2a4917a2e9f..0e1f0933dcc 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.de; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.de; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.de; + import java.io.IOException; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilter.java index f248b2ebb96..75c4499561e 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.de; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.de; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.de; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilterFactory.java index c9d73c59e0a..6d52e3b0f8e 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.de; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.de; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.de; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilter.java index 3900aa910a6..80228f7210b 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.de; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.de; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.de; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilterFactory.java index 721a6e90368..e571ceaed55 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.de; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.de; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.de; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanNormalizationFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanNormalizationFilter.java index 910bc5046b9..77d71b42042 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanNormalizationFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanNormalizationFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.de; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.de; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.de; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanNormalizationFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanNormalizationFilterFactory.java index 075decd6ac0..02effb37c84 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanNormalizationFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanNormalizationFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.de; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.de; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.de; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java index 975d1ce35fb..7bf8661cf3c 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.de; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.de; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.de; + import java.io.IOException; import java.io.InputStream; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilterFactory.java index ddd34d8be26..1383ec02d4b 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.de; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.de; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.de; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/GreekAnalyzerTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/GreekAnalyzerTest.java index d16aff3bc58..39eae8f7300 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/GreekAnalyzerTest.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/GreekAnalyzerTest.java @@ -1,11 +1,10 @@ -package org.apache.lucene.analysis.el; - /* - * Copyright 2005 The Apache Software Foundation - * - * Licensed 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 + * 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 * @@ -15,6 +14,7 @@ package org.apache.lucene.analysis.el; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.el; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.BaseTokenStreamTestCase; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekLowerCaseFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekLowerCaseFilterFactory.java index d671e1375b1..85d516d69c0 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekLowerCaseFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekLowerCaseFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.el; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.el; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.el; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekStemFilterFactory.java index 6a626bfe6ff..75d7c4ce74f 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.el; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.el; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.el; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekStemmer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekStemmer.java index 16bb0f376f6..e1b9f592305 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekStemmer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/el/TestGreekStemmer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.el; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.el; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.el; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishAnalyzer.java index be0a36b1d59..1fcbbbc66d6 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.en; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.en; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.en; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishMinimalStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishMinimalStemFilter.java index 64b37307dab..bf1335f50cd 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishMinimalStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishMinimalStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.en; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.en; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.en; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishMinimalStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishMinimalStemFilterFactory.java index 212ae3b9f7e..547a1276be3 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishMinimalStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestEnglishMinimalStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.en; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.en; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.en; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestKStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestKStemFilterFactory.java index 22052b3bed9..acefd6c4ad9 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestKStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestKStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.en; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.en; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.en; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestKStemmer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestKStemmer.java index 9339aec2a0e..d5e8a49393f 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestKStemmer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestKStemmer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.en; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.en; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.en; + import static org.apache.lucene.analysis.VocabularyAssert.assertVocabulary; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilter.java index 8627c3b8f33..9563d003648 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.en; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.en; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.en; + import java.io.IOException; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilterFactory.java index 04bee53ec88..dabb39c84a5 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.en; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.en; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.en; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishAnalyzer.java index 366d9798fe2..4bffffa63af 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.es; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.es; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.es; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishLightStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishLightStemFilter.java index fc25b69c63e..f10eaf6c657 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishLightStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishLightStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.es; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.es; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.es; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishLightStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishLightStemFilterFactory.java index 3db4ce0071f..f75b5b0f06f 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishLightStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishLightStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.es; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.es; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.es; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/eu/TestBasqueAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/eu/TestBasqueAnalyzer.java index 4e3ee219d4d..d1f64b29c4f 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/eu/TestBasqueAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/eu/TestBasqueAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.eu; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.eu; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.eu; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianAnalyzer.java index 3e085a40d1e..67982a27999 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.fa; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.fa; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.fa; + import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.BaseTokenStreamTestCase; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianCharFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianCharFilter.java index 0d10b936c04..53ad9c52789 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianCharFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianCharFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.fa; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.fa; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.fa; + import java.io.Reader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianNormalizationFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianNormalizationFilter.java index d8d504eb981..8f302e0e5ce 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianNormalizationFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianNormalizationFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.fa; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.fa; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.fa; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianNormalizationFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianNormalizationFilterFactory.java index 4de95ebf3f7..0479c00d962 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianNormalizationFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianNormalizationFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.fa; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.fa; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.fa; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishAnalyzer.java index 659bed06854..e9880c05ab9 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.fi; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.fi; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.fi; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilter.java index 05bba6a737d..09c2b4e6888 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.fi; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.fi; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.fi; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilterFactory.java index e8edf723061..852e35b7b5f 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.fi; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.fi; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.fi; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchAnalyzer.java index a441dd618d5..36fb0dc1644 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.fr; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.fr; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.fr; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilter.java index cc3a5a1f7f7..8a526f51b50 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.fr; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.fr; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.fr; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilterFactory.java index 2cf53919e90..cb5737617da 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.fr; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.fr; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.fr; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilter.java index 24f8a8221d0..d55fe516925 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.fr; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.fr; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.fr; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilterFactory.java index 708ec9b000f..d5790b695ba 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.fr; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.fr; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.fr; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishAnalyzer.java index c979722e595..54d72542dd3 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ga; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ga; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ga; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishLowerCaseFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishLowerCaseFilter.java index 3f68e1d3720..31496600df5 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishLowerCaseFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishLowerCaseFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ga; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ga; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ga; + import java.io.IOException; import org.apache.lucene.analysis.Analyzer; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishLowerCaseFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishLowerCaseFilterFactory.java index 81ae22c3262..d5d96bf6e9d 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishLowerCaseFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ga/TestIrishLowerCaseFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ga; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ga; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ga; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianAnalyzer.java index cbbe396fcb4..a215121bcb4 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.gl; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.gl; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.gl; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilter.java index 7b0503c5399..d1ffe89fdaa 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.gl; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.gl; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.gl; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilterFactory.java index 1885421b5e3..4fb75bd9cf5 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianMinimalStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.gl; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.gl; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.gl; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianStemFilter.java index 5f8116bab2b..8854d838450 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.gl; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.gl; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.gl; + import static org.apache.lucene.analysis.VocabularyAssert.assertVocabulary; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianStemFilterFactory.java index 4cef1d471d4..ef3242e2410 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.gl; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.gl; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.gl; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiAnalyzer.java index f1d06388b9c..63321d5d5f7 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiAnalyzer.java @@ -1,10 +1,3 @@ -package org.apache.lucene.analysis.hi; - -import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.util.CharArraySet; -import org.apache.lucene.util.Version; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -21,6 +14,13 @@ import org.apache.lucene.util.Version; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hi; + +import org.apache.lucene.analysis.Analyzer; +import org.apache.lucene.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.analysis.util.CharArraySet; +import org.apache.lucene.util.Version; + /** * Tests the HindiAnalyzer diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiFilters.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiFilters.java index 0eb1e682631..bdf4087fcd4 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiFilters.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiFilters.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hi; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hi; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hi; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiNormalizer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiNormalizer.java index d30dae716dc..04629117c1a 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiNormalizer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiNormalizer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hi; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hi; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hi; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiStemmer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiStemmer.java index a10fa8ff897..147971a5aa8 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiStemmer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hi/TestHindiStemmer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hi; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hi; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hi; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianAnalyzer.java index b925f4224ca..1ce8d389a1d 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hu; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hu; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hu; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilter.java index ac2c0b8dc13..3b8951c62b3 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hu; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hu; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hu; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilterFactory.java index 0d9cf13e0f4..53a1832f224 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hu; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hu; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hu; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/StemmerTestBase.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/StemmerTestBase.java index 7ea5a1d07d6..771cf950fe9 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/StemmerTestBase.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/StemmerTestBase.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hunspell; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hunspell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hunspell; + import java.io.FileNotFoundException; import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/Test64kAffixes.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/Test64kAffixes.java index 6fa6ecfb5a7..edaf536974e 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/Test64kAffixes.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/Test64kAffixes.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hunspell; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hunspell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hunspell; + import java.io.BufferedWriter; import java.io.InputStream; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestAllDictionaries.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestAllDictionaries.java index 4a66430189d..e482cf5e966 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestAllDictionaries.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestAllDictionaries.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hunspell; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hunspell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hunspell; + import java.io.InputStream; import java.nio.file.Files; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestAllDictionaries2.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestAllDictionaries2.java index efc5d66de19..ffcd82737c5 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestAllDictionaries2.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestAllDictionaries2.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hunspell; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hunspell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hunspell; + import java.io.InputStream; import java.nio.file.Files; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestAlternateCasing.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestAlternateCasing.java index 2d6a6d71ae5..31dc4d71bd2 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestAlternateCasing.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestAlternateCasing.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hunspell; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hunspell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hunspell; + import org.junit.BeforeClass; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestCaseInsensitive.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestCaseInsensitive.java index 4719f5411d3..48a327e37ac 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestCaseInsensitive.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestCaseInsensitive.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hunspell; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hunspell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hunspell; + import org.junit.BeforeClass; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestCaseSensitive.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestCaseSensitive.java index 58cf06ffe7d..d052c6f0f71 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestCaseSensitive.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestCaseSensitive.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hunspell; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hunspell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hunspell; + import org.junit.BeforeClass; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestCircumfix.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestCircumfix.java index 8eab1cce70d..f7a9a5a0d0b 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestCircumfix.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestCircumfix.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hunspell; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hunspell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hunspell; + import org.junit.BeforeClass; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestComplexPrefix.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestComplexPrefix.java index ed8ffdea26b..93494c4c73f 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestComplexPrefix.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestComplexPrefix.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hunspell; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hunspell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hunspell; + import org.junit.BeforeClass; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestCondition.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestCondition.java index ec2e27ef22b..6d39f6c1cef 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestCondition.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestCondition.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hunspell; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hunspell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hunspell; + import org.junit.BeforeClass; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestCondition2.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestCondition2.java index 9e7234a6490..970df5ae147 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestCondition2.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestCondition2.java @@ -1,7 +1,3 @@ -package org.apache.lucene.analysis.hunspell; - -import org.junit.BeforeClass; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,10 @@ import org.junit.BeforeClass; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hunspell; + +import org.junit.BeforeClass; + public class TestCondition2 extends StemmerTestBase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestConv.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestConv.java index c72fd3ff704..c62e991b744 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestConv.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestConv.java @@ -1,7 +1,3 @@ -package org.apache.lucene.analysis.hunspell; - -import org.junit.BeforeClass; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,10 @@ import org.junit.BeforeClass; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hunspell; + +import org.junit.BeforeClass; + public class TestConv extends StemmerTestBase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestDependencies.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestDependencies.java index 4f7cfbf3d7a..6fc3d0a17a1 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestDependencies.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestDependencies.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hunspell; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hunspell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hunspell; + import org.junit.BeforeClass; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestDictionary.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestDictionary.java index 39feb1d13b3..ee36feea2af 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestDictionary.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestDictionary.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hunspell; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hunspell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hunspell; + import java.io.ByteArrayInputStream; import java.io.FilterInputStream; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestDoubleEscape.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestDoubleEscape.java index 4267ae455e5..17556cc5462 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestDoubleEscape.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestDoubleEscape.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hunspell; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hunspell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hunspell; + import org.junit.BeforeClass; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestEscaped.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestEscaped.java index d5b1489b3fc..2af136a9f61 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestEscaped.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestEscaped.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hunspell; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hunspell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hunspell; + import org.junit.BeforeClass; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestFlagLong.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestFlagLong.java index 5165a240222..b5090bc28cf 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestFlagLong.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestFlagLong.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hunspell; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hunspell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hunspell; + import org.junit.BeforeClass; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestFlagNum.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestFlagNum.java index ffa38a6f4bf..ff9f1d4c6b6 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestFlagNum.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestFlagNum.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hunspell; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hunspell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hunspell; + import org.junit.BeforeClass; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestFullStrip.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestFullStrip.java index 988aa9bed34..870b759b0fe 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestFullStrip.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestFullStrip.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hunspell; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hunspell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hunspell; + import org.junit.BeforeClass; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHomonyms.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHomonyms.java index 73c73890467..a96612e4cd8 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHomonyms.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHomonyms.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hunspell; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hunspell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hunspell; + import org.junit.BeforeClass; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHunspellStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHunspellStemFilter.java index 69acc93f17b..d0cd11dde57 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHunspellStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHunspellStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hunspell; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hunspell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hunspell; + import java.io.IOException; import java.io.InputStream; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHunspellStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHunspellStemFilterFactory.java index b671f6dbdbf..77a5d34c8b5 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHunspellStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestHunspellStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hunspell; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hunspell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hunspell; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestIgnore.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestIgnore.java index 723eca94d3d..0cdd952d67d 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestIgnore.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestIgnore.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hunspell; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hunspell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hunspell; + import org.junit.BeforeClass; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestKeepCase.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestKeepCase.java index 8a04ffa4d4e..23f913481e3 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestKeepCase.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestKeepCase.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hunspell; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hunspell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hunspell; + import org.junit.BeforeClass; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestMorph.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestMorph.java index 1eb91bb1a22..1f184515112 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestMorph.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestMorph.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hunspell; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hunspell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hunspell; + import org.junit.BeforeClass; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestMorphAlias.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestMorphAlias.java index 9b401c10949..1c4b272bff8 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestMorphAlias.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestMorphAlias.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hunspell; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hunspell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hunspell; + import org.junit.BeforeClass; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestMorphData.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestMorphData.java index 373d6918904..b35f9dca758 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestMorphData.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestMorphData.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hunspell; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hunspell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hunspell; + import org.junit.BeforeClass; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestNeedAffix.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestNeedAffix.java index d11f0161ec7..5f78de33ca3 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestNeedAffix.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestNeedAffix.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hunspell; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hunspell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hunspell; + import org.junit.BeforeClass; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestOnlyInCompound.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestOnlyInCompound.java index 3f193ce0f0b..7b6f06dcd88 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestOnlyInCompound.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestOnlyInCompound.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hunspell; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hunspell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hunspell; + import org.junit.BeforeClass; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestOptionalCondition.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestOptionalCondition.java index bddee500347..5f0cf60c764 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestOptionalCondition.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestOptionalCondition.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hunspell; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hunspell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hunspell; + import org.junit.BeforeClass; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestSpaces.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestSpaces.java index f63ceb67714..4a4f87a8b8b 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestSpaces.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestSpaces.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hunspell; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hunspell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hunspell; + import org.junit.BeforeClass; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestStemmer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestStemmer.java index f63e7be7b54..8ce36a60845 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestStemmer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestStemmer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hunspell; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hunspell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hunspell; + import org.junit.BeforeClass; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestStrangeOvergeneration.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestStrangeOvergeneration.java index 1e85d66f619..0f739e59b8c 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestStrangeOvergeneration.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestStrangeOvergeneration.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hunspell; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hunspell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hunspell; + import org.junit.BeforeClass; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestTwoFold.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestTwoFold.java index 6b5ec68861f..96d559e7b04 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestTwoFold.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestTwoFold.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hunspell; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hunspell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hunspell; + import org.junit.BeforeClass; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestTwoSuffixes.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestTwoSuffixes.java index 9a347c924a3..04ca035a6e5 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestTwoSuffixes.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestTwoSuffixes.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hunspell; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hunspell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hunspell; + import org.junit.BeforeClass; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestZeroAffix.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestZeroAffix.java index a1d86ef5081..e05722046c6 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestZeroAffix.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestZeroAffix.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hunspell; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hunspell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hunspell; + import org.junit.BeforeClass; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestZeroAffix2.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestZeroAffix2.java index 1fcc0c07d2f..24c2c0457d6 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestZeroAffix2.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hunspell/TestZeroAffix2.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hunspell; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hunspell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hunspell; + import org.junit.BeforeClass; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hy/TestArmenianAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hy/TestArmenianAnalyzer.java index 73410adebba..b9934c88192 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/hy/TestArmenianAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/hy/TestArmenianAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.hy; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.hy; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.hy; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianAnalyzer.java index 42440f4a884..424f1173b65 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.id; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.id; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.id; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianStemFilterFactory.java index aa34218fce7..5b5c11ca764 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.id; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.id; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.id; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianStemmer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianStemmer.java index c72db639a76..e42b19bf50e 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianStemmer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/id/TestIndonesianStemmer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.id; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.id; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.id; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/in/TestIndicNormalizer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/in/TestIndicNormalizer.java index e4bdd6772c0..f4f56de5b04 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/in/TestIndicNormalizer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/in/TestIndicNormalizer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.in; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.in; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.in; + import java.io.IOException; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianAnalyzer.java index fc97a8e705f..bba49477701 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.it; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.it; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.it; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianLightStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianLightStemFilter.java index f2d62753208..f4eb511123c 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianLightStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianLightStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.it; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.it; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.it; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianLightStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianLightStemFilterFactory.java index 5fb7eac025c..c809f611de9 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianLightStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianLightStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.it; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.it; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.it; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/lt/TestLithuanianAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/lt/TestLithuanianAnalyzer.java index 09fab6b70ad..dda018c8f1c 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/lt/TestLithuanianAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/lt/TestLithuanianAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.lt; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.lt; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.lt; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/lt/TestLithuanianStemming.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/lt/TestLithuanianStemming.java index 0566ee4f7da..5a0e57c1a59 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/lt/TestLithuanianStemming.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/lt/TestLithuanianStemming.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.lt; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.lt; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.lt; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/lv/TestLatvianAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/lv/TestLatvianAnalyzer.java index 30541242411..4c6e432e369 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/lv/TestLatvianAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/lv/TestLatvianAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.lv; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.lv; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.lv; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/lv/TestLatvianStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/lv/TestLatvianStemFilterFactory.java index f0a1c316b75..fd0220d0dd3 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/lv/TestLatvianStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/lv/TestLatvianStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.lv; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.lv; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.lv; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/lv/TestLatvianStemmer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/lv/TestLatvianStemmer.java index f532871bd29..92fdd444dac 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/lv/TestLatvianStemmer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/lv/TestLatvianStemmer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.lv; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.lv; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.lv; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/DateRecognizerFilterFactoryTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/DateRecognizerFilterFactoryTest.java index 241a0e5cab4..8d15e18cdef 100755 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/DateRecognizerFilterFactoryTest.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/DateRecognizerFilterFactoryTest.java @@ -1,11 +1,10 @@ -package org.apache.lucene.analysis.miscellaneous; - /* - * Copyright 2004 The Apache Software Foundation - * - * Licensed 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 + * 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 * @@ -15,6 +14,7 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; import java.util.HashMap; import java.util.Map; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/DateRecognizerFilterTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/DateRecognizerFilterTest.java index 6ae81e27d48..ca3357eafe6 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/DateRecognizerFilterTest.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/DateRecognizerFilterTest.java @@ -1,11 +1,10 @@ -package org.apache.lucene.analysis.miscellaneous; - /* - * Copyright 2004 The Apache Software Foundation - * - * Licensed 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 + * 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 * @@ -15,6 +14,7 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; import java.io.IOException; import java.text.DateFormat; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestASCIIFoldingFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestASCIIFoldingFilter.java index 5214dd51603..5225aaa1fdb 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestASCIIFoldingFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestASCIIFoldingFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.BaseTokenStreamTestCase; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCapitalizationFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCapitalizationFilter.java index d9a3563b938..ef1c30e8d53 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCapitalizationFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCapitalizationFilter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.miscellaneous; import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCapitalizationFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCapitalizationFilterFactory.java index 9c19becf8c3..3581c087e33 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCapitalizationFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCapitalizationFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCodepointCountFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCodepointCountFilter.java index 8f8a40c4468..5f4c54a9f7d 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCodepointCountFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCodepointCountFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import java.io.IOException; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCodepointCountFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCodepointCountFilterFactory.java index 1eab1de9b47..026d1b7879d 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCodepointCountFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestCodepointCountFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestEmptyTokenStream.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestEmptyTokenStream.java index 0f861476857..556aff0c4b7 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestEmptyTokenStream.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestEmptyTokenStream.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestFingerprintFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestFingerprintFilter.java index 1e31dbb8f20..450447ac9ba 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestFingerprintFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestFingerprintFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.MockTokenizer; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestFingerprintFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestFingerprintFilterFactory.java index 0eb950b05c2..766429f0c36 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestFingerprintFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestFingerprintFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestHyphenatedWordsFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestHyphenatedWordsFilter.java index 48748801319..147c068fc8f 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestHyphenatedWordsFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestHyphenatedWordsFilter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.miscellaneous; import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeepFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeepFilterFactory.java index 3bc47900ed3..387ff5b8dbd 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeepFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeepFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.util.CharArraySet; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeepWordFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeepWordFilter.java index 1922ffd0728..847b26c8d1a 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeepWordFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeepWordFilter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.miscellaneous; import java.util.HashSet; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilter.java index eecc9e81aa1..9e6f6f2569d 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilter.java @@ -1,19 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - -import java.io.IOException; -import java.io.StringReader; -import java.util.Locale; -import java.util.regex.Pattern; - -import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; -import org.apache.lucene.analysis.TokenFilter; -import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.tokenattributes.KeywordAttribute; -import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; -import org.apache.lucene.analysis.util.CharArraySet; -import org.junit.Test; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -30,6 +14,22 @@ import org.junit.Test; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + +import java.io.IOException; +import java.io.StringReader; +import java.util.Locale; +import java.util.regex.Pattern; + +import org.apache.lucene.analysis.BaseTokenStreamTestCase; +import org.apache.lucene.analysis.MockTokenizer; +import org.apache.lucene.analysis.TokenFilter; +import org.apache.lucene.analysis.TokenStream; +import org.apache.lucene.analysis.tokenattributes.KeywordAttribute; +import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; +import org.apache.lucene.analysis.util.CharArraySet; +import org.junit.Test; + /** * Testcase for {@link KeywordMarkerFilter} diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilterFactory.java index c6c0ec6f46e..0de8882fb1b 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordMarkerFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordRepeatFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordRepeatFilter.java index 1d11c5c91f9..9099320011f 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordRepeatFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestKeywordRepeatFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLengthFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLengthFilter.java index 1c5de9ccb71..ac6cc41207f 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLengthFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLengthFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLengthFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLengthFilterFactory.java index 40bbe1fb783..6e754ef8058 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLengthFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLengthFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java index 55b07236fc0..3f599c18089 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountFilter.java index a62868c9fb7..304dd24e30f 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.MockTokenizer; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountFilterFactory.java index a335e613170..41b2a357958 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenOffsetFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenOffsetFilter.java index 2f78d8f4cb3..bc067d93c63 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenOffsetFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenOffsetFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.MockTokenizer; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenOffsetFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenOffsetFilterFactory.java index 46e2d7a24f8..eaef6768c51 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenOffsetFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenOffsetFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenPositionFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenPositionFilter.java index 23b5307002a..46d3025b14d 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenPositionFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenPositionFilter.java @@ -1,4 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.BaseTokenStreamTestCase; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenPositionFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenPositionFilterFactory.java index 193b18e0855..a537af40c5f 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenPositionFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenPositionFilterFactory.java @@ -1,4 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPerFieldAnalyzerWrapper.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPerFieldAnalyzerWrapper.java index 3546f6fe363..903076d68fd 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPerFieldAnalyzerWrapper.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPerFieldAnalyzerWrapper.java @@ -1,3 +1,19 @@ +/* + * 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.analysis.miscellaneous; import java.io.Reader; @@ -16,22 +32,6 @@ import org.apache.lucene.analysis.core.WhitespaceAnalyzer; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.util.IOUtils; -/* - * 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 TestPerFieldAnalyzerWrapper extends BaseTokenStreamTestCase { public void testPerField() throws Exception { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPrefixAndSuffixAwareTokenFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPrefixAndSuffixAwareTokenFilter.java index 58583d7bb90..0e6c61a7c01 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPrefixAndSuffixAwareTokenFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPrefixAndSuffixAwareTokenFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CannedTokenStream; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPrefixAwareTokenFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPrefixAwareTokenFilter.java index a717095aa87..c407c790817 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPrefixAwareTokenFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestPrefixAwareTokenFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CannedTokenStream; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestRemoveDuplicatesTokenFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestRemoveDuplicatesTokenFilter.java index affe5675490..d1e2e2ee477 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestRemoveDuplicatesTokenFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestRemoveDuplicatesTokenFilter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.miscellaneous; import org.apache.lucene.analysis.Analyzer; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestRemoveDuplicatesTokenFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestRemoveDuplicatesTokenFilterFactory.java index 0e6c7cc5faa..8b1c77fcc46 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestRemoveDuplicatesTokenFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestRemoveDuplicatesTokenFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import org.apache.lucene.analysis.CannedTokenStream; import org.apache.lucene.analysis.Token; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianFoldingFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianFoldingFilter.java index 8ceb6eb0117..e15527d4312 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianFoldingFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianFoldingFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.BaseTokenStreamTestCase; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianFoldingFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianFoldingFilterFactory.java index fc02e615d3a..9811bbacc18 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianFoldingFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianFoldingFilterFactory.java @@ -1,11 +1,10 @@ -package org.apache.lucene.analysis.miscellaneous; - /* - * Copyright 2004 The Apache Software Foundation - * - * Licensed 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 + * 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 * @@ -15,8 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianNormalizationFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianNormalizationFilter.java index 2db274b37b0..6352372cead 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianNormalizationFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianNormalizationFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.BaseTokenStreamTestCase; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianNormalizationFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianNormalizationFilterFactory.java index fed6ca890a6..65c3b822019 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianNormalizationFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestScandinavianNormalizationFilterFactory.java @@ -1,11 +1,10 @@ -package org.apache.lucene.analysis.miscellaneous; - /* - * Copyright 2004 The Apache Software Foundation - * - * Licensed 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 + * 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 * @@ -15,14 +14,11 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; -import java.io.Reader; -import java.io.StringReader; - public class TestScandinavianNormalizationFilterFactory extends BaseTokenStreamFactoryTestCase { public void testStemming() throws Exception { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilter.java index fd021801ca1..d8b2fca7bb6 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilter.java @@ -1,4 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; import java.io.IOException; import java.io.StringReader; import java.util.ArrayList; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilterFactory.java index 81d00cb9615..ed2631f7d34 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTrimFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTrimFilter.java index ecf1492c3e4..75a6e74e2ed 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTrimFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTrimFilter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.miscellaneous; import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTrimFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTrimFilterFactory.java index 2150d0b6589..986bc1c3f62 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTrimFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTrimFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTruncateTokenFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTruncateTokenFilter.java index c705decbe47..a091e373d6f 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTruncateTokenFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTruncateTokenFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTruncateTokenFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTruncateTokenFilterFactory.java index 8b2d76527b8..29f75baf4ae 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTruncateTokenFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestTruncateTokenFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.miscellaneous; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.miscellaneous; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.miscellaneous; + import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java index 3d7c03ec82a..c7dfa7dbcab 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.miscellaneous; import org.apache.lucene.analysis.*; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenFilterTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenFilterTest.java index d2e1e168954..3d0877fd445 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenFilterTest.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenFilterTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ngram; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ngram; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ngram; + import java.io.IOException; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerTest.java index 24847f8b110..c7ca4fef352 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerTest.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ngram; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ngram; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ngram; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenFilterTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenFilterTest.java index cd760c1c7a3..834933a78a1 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenFilterTest.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenFilterTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ngram; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ngram; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ngram; + import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.MockTokenizer; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java index a148ad04958..8655f3da9c9 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ngram; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ngram; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ngram; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestNGramFilters.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestNGramFilters.java index 59da787e584..d429f61e73b 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestNGramFilters.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/TestNGramFilters.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ngram; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ngram; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ngram; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/nl/TestDutchAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/nl/TestDutchAnalyzer.java index dba8db0ef76..b7f3ebc64ca 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/nl/TestDutchAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/nl/TestDutchAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.nl; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.nl; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.nl; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianAnalyzer.java index 3bb04e38d90..1dd9217c133 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.no; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.no; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.no; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianLightStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianLightStemFilter.java index 0dfb39111b4..38fe12b20f7 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianLightStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianLightStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.no; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.no; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.no; + import java.io.IOException; import java.nio.file.Files; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianLightStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianLightStemFilterFactory.java index 26a2148dfba..6f7f8760a50 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianLightStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianLightStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.no; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.no; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.no; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianMinimalStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianMinimalStemFilter.java index 1541075ad47..d0593dc0815 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianMinimalStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianMinimalStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.no; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.no; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.no; + import java.io.IOException; import java.nio.file.Files; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianMinimalStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianMinimalStemFilterFactory.java index 15bc15c2763..c433b763998 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianMinimalStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/no/TestNorwegianMinimalStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.no; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.no; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.no; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/path/TestPathHierarchyTokenizer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/path/TestPathHierarchyTokenizer.java index 7bacf864073..afe1523f289 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/path/TestPathHierarchyTokenizer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/path/TestPathHierarchyTokenizer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.path; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.path; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.path; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/path/TestReversePathHierarchyTokenizer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/path/TestReversePathHierarchyTokenizer.java index 4b9df02b88e..5d423a37f3b 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/path/TestReversePathHierarchyTokenizer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/path/TestReversePathHierarchyTokenizer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.path; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.path; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.path; + import java.io.StringReader; import java.util.Random; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternCaptureGroupTokenFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternCaptureGroupTokenFilter.java index a911d395732..654f744bc3d 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternCaptureGroupTokenFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternCaptureGroupTokenFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.pattern; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.pattern; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.pattern; + import java.io.StringReader; import java.util.regex.Pattern; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceCharFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceCharFilter.java index b5cec2ffbfd..7e1a419ba99 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceCharFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceCharFilter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.pattern; import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceCharFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceCharFilterFactory.java index 2271cb6e379..f1c555306c8 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceCharFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceCharFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.pattern; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.pattern; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.pattern; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceFilter.java index b4d98e15368..16fad28c55f 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceFilter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.pattern; import org.apache.lucene.analysis.Analyzer; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceFilterFactory.java index 36175a652cf..24f751a422b 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternReplaceFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.pattern; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.pattern; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.pattern; + import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternTokenizer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternTokenizer.java index 30badb8c14e..196212c970f 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternTokenizer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternTokenizer.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.pattern; import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternTokenizerFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternTokenizerFactory.java index 29e02430bbb..a0d1af4f4ea 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternTokenizerFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pattern/TestPatternTokenizerFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.pattern; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.pattern; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.pattern; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilterTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilterTest.java index 6dc5b3fd602..f31da3ae776 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilterTest.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/DelimitedPayloadTokenFilterTest.java @@ -1,4 +1,3 @@ -package org.apache.lucene.analysis.payloads; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.analysis.payloads; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.payloads; import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.MockTokenizer; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterTest.java index a54f14760bc..3e54cc0c49a 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterTest.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/NumericPayloadTokenFilterTest.java @@ -1,11 +1,10 @@ -package org.apache.lucene.analysis.payloads; - /* - * Copyright 2004 The Apache Software Foundation - * - * Licensed 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 + * 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 * @@ -15,6 +14,7 @@ package org.apache.lucene.analysis.payloads; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.payloads; import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.MockTokenizer; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TestDelimitedPayloadTokenFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TestDelimitedPayloadTokenFilterFactory.java index ebf86545211..a9bec99af8d 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TestDelimitedPayloadTokenFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TestDelimitedPayloadTokenFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.payloads; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.payloads; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.payloads; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilterTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilterTest.java index 500863cf299..c4a44124715 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilterTest.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TokenOffsetPayloadTokenFilterTest.java @@ -1,11 +1,10 @@ -package org.apache.lucene.analysis.payloads; - /* - * Copyright 2004 The Apache Software Foundation - * - * Licensed 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 + * 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 * @@ -15,9 +14,9 @@ package org.apache.lucene.analysis.payloads; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.payloads; import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; import org.apache.lucene.analysis.tokenattributes.PayloadAttribute; import org.apache.lucene.util.BytesRef; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterTest.java index ef1345da873..f9010166714 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterTest.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/payloads/TypeAsPayloadTokenFilterTest.java @@ -1,11 +1,10 @@ -package org.apache.lucene.analysis.payloads; - /* - * Copyright 2004 The Apache Software Foundation - * - * Licensed 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 + * 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 * @@ -15,9 +14,9 @@ package org.apache.lucene.analysis.payloads; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.payloads; import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.PayloadAttribute; @@ -25,8 +24,6 @@ import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.TypeAttribute; import java.io.IOException; -import java.io.StringReader; -import java.nio.charset.StandardCharsets; public class TypeAsPayloadTokenFilterTest extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseAnalyzer.java index c4230260b22..7e4dba73a2c 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.pt; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.pt; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.pt; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseLightStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseLightStemFilter.java index 8e84fb9103c..00a6d0f02b5 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseLightStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseLightStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.pt; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.pt; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.pt; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseLightStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseLightStemFilterFactory.java index 411005d4ffe..0af152ad23b 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseLightStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseLightStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.pt; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.pt; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.pt; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseMinimalStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseMinimalStemFilter.java index 832df17df81..e9dd5841dd5 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseMinimalStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseMinimalStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.pt; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.pt; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.pt; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseMinimalStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseMinimalStemFilterFactory.java index 19c7838cdf5..5ad28b500f3 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseMinimalStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseMinimalStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.pt; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.pt; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.pt; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseStemFilter.java index eb45b11fadc..520992323b0 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.pt; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.pt; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.pt; + import static org.apache.lucene.analysis.VocabularyAssert.assertVocabulary; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseStemFilterFactory.java index 932b7082d69..e00ba793c19 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.pt; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.pt; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.pt; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java index 9b29f60c827..f790597647f 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java @@ -1,4 +1,3 @@ -package org.apache.lucene.analysis.query; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.analysis.query; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.query; import org.apache.lucene.analysis.*; import org.apache.lucene.document.Document; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/reverse/TestReverseStringFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/reverse/TestReverseStringFilter.java index 7f70eba4c8f..303f7fedc01 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/reverse/TestReverseStringFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/reverse/TestReverseStringFilter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.reverse; import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/reverse/TestReverseStringFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/reverse/TestReverseStringFilterFactory.java index ddf6ede27a3..72b2b336ea8 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/reverse/TestReverseStringFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/reverse/TestReverseStringFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.reverse; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.reverse; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.reverse; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ro/TestRomanianAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ro/TestRomanianAnalyzer.java index 18cdb94b2b8..1d4e2f59518 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ro/TestRomanianAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ro/TestRomanianAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ro; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ro; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ro; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianAnalyzer.java index 3435d05ec36..60e9fb4e9a1 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ru; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ru; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ru; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianLightStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianLightStemFilter.java index ef83eb7ef89..19b9309db69 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianLightStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianLightStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ru; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ru; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ru; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianLightStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianLightStemFilterFactory.java index 8e20ce8967a..bf82ea8c4c4 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianLightStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianLightStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ru; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ru; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ru; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java index f89ec1e8da1..c97ec033bab 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.shingle; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.shingle; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.shingle; + import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.BaseTokenStreamTestCase; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleFilterTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleFilterTest.java index 52866f61538..801e5e6d68f 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleFilterTest.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleFilterTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.shingle; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.shingle; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.shingle; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/TestShingleFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/TestShingleFilterFactory.java index 1220a4a9440..aed5f0bd106 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/TestShingleFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/shingle/TestShingleFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.shingle; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.shingle; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.shingle; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java index 4b2b8c4dfc8..735f12ecfcf 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java @@ -1,11 +1,10 @@ -package org.apache.lucene.analysis.sinks; - /* - * Copyright 2004 The Apache Software Foundation - * - * Licensed 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 + * 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 * @@ -15,6 +14,7 @@ package org.apache.lucene.analysis.sinks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.sinks; import java.io.IOException; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java index 4b16fe914ff..881bc2f576f 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.snowball; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.snowball; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.snowball; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballPorterFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballPorterFilterFactory.java index e527ca1f9ba..6dc1104f0c2 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballPorterFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballPorterFilterFactory.java @@ -1,11 +1,10 @@ -package org.apache.lucene.analysis.snowball; - /* - * Copyright 2004 The Apache Software Foundation - * - * Licensed 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 + * 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 * @@ -15,8 +14,8 @@ package org.apache.lucene.analysis.snowball; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.snowball; -import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; import org.apache.lucene.analysis.util.StringMockResourceLoader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java index 66ab7db436e..d215e02dc3b 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.snowball; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.snowball; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.snowball; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sr/TestSerbianNormalizationFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sr/TestSerbianNormalizationFilter.java index 7217cf4eeba..c38c9326cfa 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sr/TestSerbianNormalizationFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sr/TestSerbianNormalizationFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.sr; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.sr; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.sr; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sr/TestSerbianNormalizationFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sr/TestSerbianNormalizationFilterFactory.java index 3bea320d6da..8c45ed0a015 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sr/TestSerbianNormalizationFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sr/TestSerbianNormalizationFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.sr; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.sr; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.sr; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sr/TestSerbianNormalizationRegularFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sr/TestSerbianNormalizationRegularFilter.java index 586e867993f..be1c5a61c23 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sr/TestSerbianNormalizationRegularFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sr/TestSerbianNormalizationRegularFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.sr; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.sr; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.sr; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestClassicAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestClassicAnalyzer.java index 90b31d2d257..45797c066a9 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestClassicAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestClassicAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.standard; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.standard; * 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.Analyzer; import org.apache.lucene.analysis.BaseTokenStreamTestCase; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestStandardAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestStandardAnalyzer.java index 113d94de9b8..6c6ddc86cfe 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestStandardAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestStandardAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.standard; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.standard; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.standard; + import java.io.IOException; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestStandardFactories.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestStandardFactories.java index 89bc451ec3d..17d3468e430 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestStandardFactories.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestStandardFactories.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.standard; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.standard; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.standard; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailAnalyzer.java index ea798a367df..14a5165e6bb 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.standard; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.standard; * 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.Analyzer; import org.apache.lucene.analysis.BaseTokenStreamTestCase; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailTokenizer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailTokenizer.java index 24f2c1a9bb8..8d3c706ee1f 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailTokenizer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailTokenizer.java @@ -1,3 +1,19 @@ +/* + * 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.analysis.standard; import org.apache.lucene.analysis.Analyzer; @@ -22,22 +38,6 @@ import java.util.Arrays; import java.util.List; import java.util.Random; -/* - * 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 TestUAX29URLEmailTokenizer extends BaseTokenStreamTestCase { diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailTokenizerFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailTokenizerFactory.java index d8ce2d5bbcc..f2034645d92 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailTokenizerFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailTokenizerFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.standard; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.standard; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.standard; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/WordBreakTestUnicode_6_3_0.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/WordBreakTestUnicode_6_3_0.java index f67a6bc44bc..4a3731ed019 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/WordBreakTestUnicode_6_3_0.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/WordBreakTestUnicode_6_3_0.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.standard; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.standard; * 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.Analyzer; import org.apache.lucene.analysis.BaseTokenStreamTestCase; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishAnalyzer.java index 0fd8a9aa250..b9d586edcff 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.sv; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.sv; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.sv; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishLightStemFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishLightStemFilter.java index 12db7623835..ebe1034ec7f 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishLightStemFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishLightStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.sv; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.sv; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.sv; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishLightStemFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishLightStemFilterFactory.java index 8fd12335a88..04e946b2e7c 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishLightStemFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishLightStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.sv; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.sv; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.sv; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/BaseSynonymParserTestCase.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/BaseSynonymParserTestCase.java index 1c80fc63978..0f002af28e2 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/BaseSynonymParserTestCase.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/BaseSynonymParserTestCase.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.synonym; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.synonym; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.synonym; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestMultiWordSynonyms.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestMultiWordSynonyms.java index 7306d4585db..8a1a9165667 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestMultiWordSynonyms.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestMultiWordSynonyms.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.synonym; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.synonym; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.synonym; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.util.BaseTokenStreamFactoryTestCase; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSolrSynonymParser.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSolrSynonymParser.java index 82e5958fe85..a7e2da9e20d 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSolrSynonymParser.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSolrSynonymParser.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.synonym; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.synonym; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.synonym; + import java.io.StringReader; import java.text.ParseException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymFilterFactory.java index 21e1eccc9f6..eedf25b1227 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.synonym; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.synonym; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.synonym; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymMapFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymMapFilter.java index 9b2b69dfa07..9e1c09503bb 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymMapFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymMapFilter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.synonym; import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestWordnetSynonymParser.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestWordnetSynonymParser.java index d70e849cfaf..675c8291da6 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestWordnetSynonymParser.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestWordnetSynonymParser.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.synonym; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiAnalyzer.java index c869edb375f..c4b9276114f 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.th; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.th; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.th; + import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.BaseTokenStreamTestCase; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiTokenizerFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiTokenizerFactory.java index 49949820427..f8bf8a6b8ae 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiTokenizerFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/th/TestThaiTokenizerFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.th; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.th; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.th; + import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestApostropheFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestApostropheFilter.java index 4488c4b935c..e39ecf565fb 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestApostropheFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestApostropheFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.tr; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.tr; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.tr; + import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestApostropheFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestApostropheFilterFactory.java index 6c161370fcd..f87446790f4 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestApostropheFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestApostropheFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.tr; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.tr; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.tr; + import org.apache.lucene.analysis.MockTokenizer; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishAnalyzer.java index 3577ea067c9..9972702395f 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.tr; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.tr; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.tr; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishLowerCaseFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishLowerCaseFilter.java index 0ca34211d78..04540d19cd2 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishLowerCaseFilter.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishLowerCaseFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.tr; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.tr; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.tr; + import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishLowerCaseFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishLowerCaseFilterFactory.java index 9b8de8218ba..12a829d8ae9 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishLowerCaseFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/tr/TestTurkishLowerCaseFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.tr; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.tr; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.tr; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/BaseTokenStreamFactoryTestCase.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/BaseTokenStreamFactoryTestCase.java index 08c23824616..5a41454fc1c 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/BaseTokenStreamFactoryTestCase.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/BaseTokenStreamFactoryTestCase.java @@ -1,5 +1,3 @@ -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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.util; + import java.lang.reflect.InvocationTargetException; import java.util.HashMap; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/StringMockResourceLoader.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/StringMockResourceLoader.java index 6a8d1b58a35..883671d1941 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/StringMockResourceLoader.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/StringMockResourceLoader.java @@ -1,5 +1,3 @@ -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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.util; + import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestAnalysisSPILoader.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestAnalysisSPILoader.java index 53ffe881e7d..3e47fe2d1f2 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestAnalysisSPILoader.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestAnalysisSPILoader.java @@ -1,5 +1,3 @@ -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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.util; + import java.util.HashMap; import java.util.Map; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArrayIterator.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArrayIterator.java index 2c964a9ea98..e39fa07ca83 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArrayIterator.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArrayIterator.java @@ -1,5 +1,3 @@ -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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.util; + import java.text.BreakIterator; import java.text.CharacterIterator; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArrayMap.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArrayMap.java index fdc830fb2f5..a926543a2fc 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArrayMap.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArrayMap.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.util; import java.util.*; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArraySet.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArraySet.java index 57e9396347a..04b211becbc 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArraySet.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharArraySet.java @@ -1,5 +1,3 @@ -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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.util; + import java.util.*; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharTokenizers.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharTokenizers.java index fcc728c0950..783fc3e4b51 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharTokenizers.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharTokenizers.java @@ -1,5 +1,3 @@ -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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.util; + import java.io.IOException; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharacterUtils.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharacterUtils.java index b39b4cda73b..758862911b6 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharacterUtils.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestCharacterUtils.java @@ -1,5 +1,3 @@ -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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.util; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestElision.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestElision.java index 2ff55655d09..5e1d3c1ef09 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestElision.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestElision.java @@ -1,5 +1,3 @@ -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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.util; + import java.io.IOException; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestElisionFilterFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestElisionFilterFactory.java index 7f75dd111e9..d48db628f8c 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestElisionFilterFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestElisionFilterFactory.java @@ -1,5 +1,3 @@ -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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.util; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestFilesystemResourceLoader.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestFilesystemResourceLoader.java index 80de40ffbd8..3846c5f2c3f 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestFilesystemResourceLoader.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestFilesystemResourceLoader.java @@ -1,5 +1,3 @@ -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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.util; + import java.io.IOException; import java.io.InputStreamReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestRollingCharBuffer.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestRollingCharBuffer.java index d249663eb2c..558196a2f4e 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestRollingCharBuffer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestRollingCharBuffer.java @@ -1,5 +1,3 @@ -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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.util; + import java.io.StringReader; import java.util.Random; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestSegmentingTokenizerBase.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestSegmentingTokenizerBase.java index 3a4cc3292dd..d7502f97a40 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestSegmentingTokenizerBase.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestSegmentingTokenizerBase.java @@ -1,5 +1,3 @@ -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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.util; + import java.io.IOException; import java.text.BreakIterator; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestWordlistLoader.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestWordlistLoader.java index bd2ebdba71f..b1dd1b591ff 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestWordlistLoader.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/util/TestWordlistLoader.java @@ -1,5 +1,3 @@ -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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.util; + import java.io.BufferedReader; import java.io.IOException; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/TestWikipediaTokenizerFactory.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/TestWikipediaTokenizerFactory.java index 6632bf95cdd..aa0e5ec79dc 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/TestWikipediaTokenizerFactory.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/TestWikipediaTokenizerFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.wikipedia; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.wikipedia; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.wikipedia; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerTest.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerTest.java index 039311d16ba..638faa8b221 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerTest.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerTest.java @@ -15,7 +15,6 @@ * limitations under the License. */ - package org.apache.lucene.analysis.wikipedia; import java.io.StringReader; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/collation/TestCollationDocValuesField.java b/lucene/analysis/common/src/test/org/apache/lucene/collation/TestCollationDocValuesField.java index 5e370cda164..3a81ba420a9 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/collation/TestCollationDocValuesField.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/collation/TestCollationDocValuesField.java @@ -1,5 +1,3 @@ -package org.apache.lucene.collation; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.collation; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.collation; + import java.text.Collator; import java.util.Locale; diff --git a/lucene/analysis/common/src/test/org/apache/lucene/collation/TestCollationKeyAnalyzer.java b/lucene/analysis/common/src/test/org/apache/lucene/collation/TestCollationKeyAnalyzer.java index 6d626c0e280..b1a7fb288a5 100644 --- a/lucene/analysis/common/src/test/org/apache/lucene/collation/TestCollationKeyAnalyzer.java +++ b/lucene/analysis/common/src/test/org/apache/lucene/collation/TestCollationKeyAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.collation; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.collation; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.collation; + import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.CollationTestBase; diff --git a/lucene/analysis/common/src/tools/java/org/apache/lucene/analysis/standard/GenerateJflexTLDMacros.java b/lucene/analysis/common/src/tools/java/org/apache/lucene/analysis/standard/GenerateJflexTLDMacros.java index 67226226764..937a4f9d907 100644 --- a/lucene/analysis/common/src/tools/java/org/apache/lucene/analysis/standard/GenerateJflexTLDMacros.java +++ b/lucene/analysis/common/src/tools/java/org/apache/lucene/analysis/standard/GenerateJflexTLDMacros.java @@ -1,13 +1,12 @@ -package org.apache.lucene.analysis.standard; - /* - * Copyright 2001-2005 The Apache Software Foundation. + * 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 * - * Licensed 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 + * 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, @@ -15,6 +14,7 @@ package org.apache.lucene.analysis.standard; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.standard; import java.io.BufferedReader; import java.io.File; diff --git a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUFoldingFilter.java b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUFoldingFilter.java index 2a37aaf92e8..3fad465965a 100644 --- a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUFoldingFilter.java +++ b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUFoldingFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.icu; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.icu; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.icu; + import org.apache.lucene.analysis.TokenStream; diff --git a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUFoldingFilterFactory.java b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUFoldingFilterFactory.java index f1352cb0f2e..8a42ae41fd6 100644 --- a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUFoldingFilterFactory.java +++ b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUFoldingFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.icu; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.icu; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.icu; + import java.util.Map; diff --git a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUNormalizer2CharFilter.java b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUNormalizer2CharFilter.java index b5fc575866f..706550a0f71 100644 --- a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUNormalizer2CharFilter.java +++ b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUNormalizer2CharFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.icu; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.icu; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.icu; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUNormalizer2CharFilterFactory.java b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUNormalizer2CharFilterFactory.java index 75f0206c451..ab8e245a701 100644 --- a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUNormalizer2CharFilterFactory.java +++ b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUNormalizer2CharFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.icu; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.icu; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.icu; + import java.io.Reader; import java.util.Arrays; diff --git a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUNormalizer2Filter.java b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUNormalizer2Filter.java index eb445d41b4d..000d7c27d3d 100644 --- a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUNormalizer2Filter.java +++ b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUNormalizer2Filter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.icu; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.icu; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.icu; + import java.io.IOException; diff --git a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUNormalizer2FilterFactory.java b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUNormalizer2FilterFactory.java index 7c81367e828..bb8c27b7361 100644 --- a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUNormalizer2FilterFactory.java +++ b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUNormalizer2FilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.icu; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.icu; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.icu; + import java.util.Arrays; import java.util.Map; diff --git a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUTransformFilter.java b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUTransformFilter.java index 52493ebd8cc..e48c4ba731d 100644 --- a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUTransformFilter.java +++ b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUTransformFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.icu; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.icu; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.icu; + import java.io.IOException; diff --git a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUTransformFilterFactory.java b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUTransformFilterFactory.java index 9330829c8e3..ec3a9cf4c84 100644 --- a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUTransformFilterFactory.java +++ b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/ICUTransformFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.icu; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.icu; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.icu; + import java.util.Arrays; import java.util.Map; diff --git a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/package-info.java b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/package-info.java index a396db4d561..239b5748bf6 100644 --- a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/package-info.java +++ b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analysis components based on ICU */ diff --git a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/BreakIteratorWrapper.java b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/BreakIteratorWrapper.java index f7cbe501f7b..d8ecb77d401 100644 --- a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/BreakIteratorWrapper.java +++ b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/BreakIteratorWrapper.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.icu.segmentation; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.icu.segmentation; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.icu.segmentation; + import java.text.CharacterIterator; diff --git a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/CharArrayIterator.java b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/CharArrayIterator.java index 260e836fc89..3a8ee7651cf 100644 --- a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/CharArrayIterator.java +++ b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/CharArrayIterator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.icu.segmentation; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.icu.segmentation; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.icu.segmentation; + import java.text.CharacterIterator; diff --git a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/CompositeBreakIterator.java b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/CompositeBreakIterator.java index 51ff1647f53..e7b5f76bd45 100644 --- a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/CompositeBreakIterator.java +++ b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/CompositeBreakIterator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.icu.segmentation; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.icu.segmentation; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.icu.segmentation; + import com.ibm.icu.lang.UScript; import com.ibm.icu.text.BreakIterator; diff --git a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/DefaultICUTokenizerConfig.java b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/DefaultICUTokenizerConfig.java index c3a66d27e0b..dbf9b2e7f4f 100644 --- a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/DefaultICUTokenizerConfig.java +++ b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/DefaultICUTokenizerConfig.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.icu.segmentation; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.icu.segmentation; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.icu.segmentation; + import java.io.IOException; import java.io.InputStream; diff --git a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ICUTokenizer.java b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ICUTokenizer.java index efaffb6db63..64c6785fb0e 100644 --- a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ICUTokenizer.java +++ b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ICUTokenizer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.icu.segmentation; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.icu.segmentation; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.icu.segmentation; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ICUTokenizerConfig.java b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ICUTokenizerConfig.java index c972d0c1205..69694fc0780 100644 --- a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ICUTokenizerConfig.java +++ b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ICUTokenizerConfig.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.icu.segmentation; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.icu.segmentation; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.icu.segmentation; + import com.ibm.icu.text.BreakIterator; diff --git a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ICUTokenizerFactory.java b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ICUTokenizerFactory.java index 26c6fcf7e57..deb5d4fbbca 100644 --- a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ICUTokenizerFactory.java +++ b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ICUTokenizerFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.icu.segmentation; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.icu.segmentation; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.icu.segmentation; + import java.io.BufferedReader; import java.io.IOException; diff --git a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ScriptIterator.java b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ScriptIterator.java index 4913f1133e4..d17889b10f8 100644 --- a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ScriptIterator.java +++ b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/ScriptIterator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.icu.segmentation; - /** * Copyright (C) 1999-2010, International Business Machines * Corporation and others. All Rights Reserved. @@ -27,6 +25,7 @@ package org.apache.lucene.analysis.icu.segmentation; * dealings in this Software without prior written authorization of the * copyright holder. */ +package org.apache.lucene.analysis.icu.segmentation; import com.ibm.icu.lang.UCharacter; import com.ibm.icu.lang.UCharacterEnums.ECharacterCategory; diff --git a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/package-info.java b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/package-info.java index 81c904f9c15..6d61333ae4d 100644 --- a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/package-info.java +++ b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Tokenizer that breaks text into words with the Unicode Text Segmentation algorithm. */ diff --git a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/tokenattributes/ScriptAttribute.java b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/tokenattributes/ScriptAttribute.java index a196a6b4135..54c8341ccc0 100644 --- a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/tokenattributes/ScriptAttribute.java +++ b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/tokenattributes/ScriptAttribute.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.icu.tokenattributes; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.icu.tokenattributes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.icu.tokenattributes; + import org.apache.lucene.util.Attribute; diff --git a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/tokenattributes/ScriptAttributeImpl.java b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/tokenattributes/ScriptAttributeImpl.java index e9d911964da..ed12fbde2f9 100644 --- a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/tokenattributes/ScriptAttributeImpl.java +++ b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/tokenattributes/ScriptAttributeImpl.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.icu.tokenattributes; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.icu.tokenattributes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.icu.tokenattributes; + import org.apache.lucene.util.AttributeImpl; import org.apache.lucene.util.AttributeReflector; diff --git a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/tokenattributes/package-info.java b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/tokenattributes/package-info.java index d600eb3d21f..cecd9d34ec9 100644 --- a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/tokenattributes/package-info.java +++ b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/tokenattributes/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Additional ICU-specific Attributes for text analysis. */ diff --git a/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationAttributeFactory.java b/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationAttributeFactory.java index 2f890462686..5ad9209f3c3 100644 --- a/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationAttributeFactory.java +++ b/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationAttributeFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.collation; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.collation; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.collation; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.collation.tokenattributes.ICUCollatedTermAttributeImpl; diff --git a/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationDocValuesField.java b/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationDocValuesField.java index e76ac57da4d..9ae46851b0f 100644 --- a/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationDocValuesField.java +++ b/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationDocValuesField.java @@ -1,5 +1,3 @@ -package org.apache.lucene.collation; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.collation; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.collation; + import org.apache.lucene.document.Field; import org.apache.lucene.document.SortedDocValuesField; diff --git a/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationKeyAnalyzer.java b/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationKeyAnalyzer.java index 3ff4f3a41ea..67b64bb0f53 100644 --- a/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationKeyAnalyzer.java +++ b/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationKeyAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.collation; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.collation; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.collation; + import com.ibm.icu.text.Collator; diff --git a/lucene/analysis/icu/src/java/org/apache/lucene/collation/tokenattributes/ICUCollatedTermAttributeImpl.java b/lucene/analysis/icu/src/java/org/apache/lucene/collation/tokenattributes/ICUCollatedTermAttributeImpl.java index fdbaf74e610..793dec2ce1a 100644 --- a/lucene/analysis/icu/src/java/org/apache/lucene/collation/tokenattributes/ICUCollatedTermAttributeImpl.java +++ b/lucene/analysis/icu/src/java/org/apache/lucene/collation/tokenattributes/ICUCollatedTermAttributeImpl.java @@ -1,5 +1,3 @@ -package org.apache.lucene.collation.tokenattributes; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.collation.tokenattributes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.collation.tokenattributes; + import org.apache.lucene.analysis.tokenattributes.CharTermAttributeImpl; import org.apache.lucene.util.BytesRef; diff --git a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUFoldingFilter.java b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUFoldingFilter.java index 259895c69f0..e9d9ce98c74 100644 --- a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUFoldingFilter.java +++ b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUFoldingFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.icu; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.icu; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.icu; + import java.io.IOException; diff --git a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUFoldingFilterFactory.java b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUFoldingFilterFactory.java index eeec55d3cf0..719ad20e5ce 100644 --- a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUFoldingFilterFactory.java +++ b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUFoldingFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.icu; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.icu; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.icu; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2CharFilter.java b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2CharFilter.java index 6c13cb072c5..438a93179c2 100644 --- a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2CharFilter.java +++ b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2CharFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.icu; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.icu; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.icu; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2CharFilterFactory.java b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2CharFilterFactory.java index eee19a8bffa..da817777fc4 100644 --- a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2CharFilterFactory.java +++ b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2CharFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.icu; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.icu; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.icu; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2Filter.java b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2Filter.java index ac0b59e352a..6b6c8e57c70 100644 --- a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2Filter.java +++ b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2Filter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.icu; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.icu; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.icu; + import java.io.IOException; diff --git a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2FilterFactory.java b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2FilterFactory.java index 789f22af030..90a14f36328 100644 --- a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2FilterFactory.java +++ b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUNormalizer2FilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.icu; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.icu; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.icu; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUTransformFilter.java b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUTransformFilter.java index 6fe935388b5..b7350c84edd 100644 --- a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUTransformFilter.java +++ b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUTransformFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.icu; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.icu; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.icu; + import java.io.IOException; import java.io.StringReader; diff --git a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUTransformFilterFactory.java b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUTransformFilterFactory.java index 720570c1d5f..b74984ce801 100644 --- a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUTransformFilterFactory.java +++ b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/TestICUTransformFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.icu; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.icu; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.icu; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestCharArrayIterator.java b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestCharArrayIterator.java index 9c51cafde1e..14d7f0f27de 100644 --- a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestCharArrayIterator.java +++ b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestCharArrayIterator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.icu.segmentation; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.icu.segmentation; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.icu.segmentation; + import java.text.CharacterIterator; diff --git a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizer.java b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizer.java index ca742ae1f27..f60954fcd58 100644 --- a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizer.java +++ b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.icu.segmentation; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.icu.segmentation; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.icu.segmentation; + import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.BaseTokenStreamTestCase; diff --git a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizerCJK.java b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizerCJK.java index f66686863d4..a29686c68eb 100644 --- a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizerCJK.java +++ b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizerCJK.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.icu.segmentation; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.icu.segmentation; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.icu.segmentation; + import java.util.Random; diff --git a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizerFactory.java b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizerFactory.java index dacd3734891..e288c4df32f 100644 --- a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizerFactory.java +++ b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizerFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.icu.segmentation; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.icu.segmentation; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.icu.segmentation; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestWithCJKBigramFilter.java b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestWithCJKBigramFilter.java index 6d58a5fd7eb..f2fd50a4433 100644 --- a/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestWithCJKBigramFilter.java +++ b/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestWithCJKBigramFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.icu.segmentation; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.icu.segmentation; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.icu.segmentation; + import java.io.IOException; diff --git a/lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationDocValuesField.java b/lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationDocValuesField.java index f938c89e6e4..28fdd43ccfe 100644 --- a/lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationDocValuesField.java +++ b/lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationDocValuesField.java @@ -1,5 +1,3 @@ -package org.apache.lucene.collation; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.collation; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.collation; + import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; diff --git a/lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyAnalyzer.java b/lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyAnalyzer.java index 532f03ff93a..91f8aed87c4 100644 --- a/lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyAnalyzer.java +++ b/lucene/analysis/icu/src/test/org/apache/lucene/collation/TestICUCollationKeyAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.collation; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.collation; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.collation; + import com.ibm.icu.text.Collator; diff --git a/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateUTR30DataFiles.java b/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateUTR30DataFiles.java index ddba91922bb..035a3a086b2 100644 --- a/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateUTR30DataFiles.java +++ b/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateUTR30DataFiles.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.icu; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.icu; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.icu; + import com.ibm.icu.lang.UCharacter; import com.ibm.icu.lang.UProperty; diff --git a/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/RBBIRuleCompiler.java b/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/RBBIRuleCompiler.java index a4745d75e1f..50e1275ccfe 100644 --- a/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/RBBIRuleCompiler.java +++ b/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/RBBIRuleCompiler.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.icu; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.icu; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.icu; + import java.io.BufferedReader; import java.io.File; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/GraphvizFormatter.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/GraphvizFormatter.java index ac5ba306889..df3c0676ea1 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/GraphvizFormatter.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/GraphvizFormatter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja; + import java.util.HashMap; import java.util.Map; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseAnalyzer.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseAnalyzer.java index fe3dc2e6bb6..bff30f17529 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseAnalyzer.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja; + import java.io.IOException; import java.util.HashSet; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseBaseFormFilter.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseBaseFormFilter.java index 5c704bdb5b5..255ea2c42af 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseBaseFormFilter.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseBaseFormFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja; + import java.io.IOException; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseBaseFormFilterFactory.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseBaseFormFilterFactory.java index e033f6de6a3..a811f8da241 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseBaseFormFilterFactory.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseBaseFormFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja; + import java.util.Map; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseIterationMarkCharFilter.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseIterationMarkCharFilter.java index 43a0f00bd57..4f768b732f9 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseIterationMarkCharFilter.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseIterationMarkCharFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja; + import org.apache.lucene.analysis.CharFilter; import org.apache.lucene.analysis.util.RollingCharBuffer; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseIterationMarkCharFilterFactory.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseIterationMarkCharFilterFactory.java index 5ec765405c5..0b5b72fdb85 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseIterationMarkCharFilterFactory.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseIterationMarkCharFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja; + import org.apache.lucene.analysis.CharFilter; import org.apache.lucene.analysis.ja.JapaneseIterationMarkCharFilter; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseKatakanaStemFilter.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseKatakanaStemFilter.java index a1ab82425c6..e97b2c6a9bb 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseKatakanaStemFilter.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseKatakanaStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja; + import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseKatakanaStemFilterFactory.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseKatakanaStemFilterFactory.java index b0a92688122..740f8abf409 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseKatakanaStemFilterFactory.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseKatakanaStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.ja.JapaneseKatakanaStemFilter; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseNumberFilter.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseNumberFilter.java index d70e8051ae0..b8d0a787c81 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseNumberFilter.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseNumberFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja; + import java.io.IOException; import java.math.BigDecimal; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseNumberFilterFactory.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseNumberFilterFactory.java index 8cb3ac193dc..3279c8bf83e 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseNumberFilterFactory.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseNumberFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja; + import java.util.Map; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapanesePartOfSpeechStopFilter.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapanesePartOfSpeechStopFilter.java index 11bb4e67e62..0ee9ccf200d 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapanesePartOfSpeechStopFilter.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapanesePartOfSpeechStopFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja; + import java.util.Set; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapanesePartOfSpeechStopFilterFactory.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapanesePartOfSpeechStopFilterFactory.java index 3e9365ac3ac..8b5483cac16 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapanesePartOfSpeechStopFilterFactory.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapanesePartOfSpeechStopFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja; + import java.io.IOException; import java.util.HashSet; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseReadingFormFilter.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseReadingFormFilter.java index ec92769fc95..359de90ade7 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseReadingFormFilter.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseReadingFormFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja; + import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseReadingFormFilterFactory.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseReadingFormFilterFactory.java index f09c5e6771a..e0ac05f0785 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseReadingFormFilterFactory.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseReadingFormFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.ja.JapaneseReadingFormFilter; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseTokenizer.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseTokenizer.java index a1f9545049f..5641e6c1f5e 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseTokenizer.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseTokenizer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja; + import java.io.IOException; import java.io.StringReader; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseTokenizerFactory.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseTokenizerFactory.java index 6afd54cce04..99ad61b22ae 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseTokenizerFactory.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseTokenizerFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja; + import java.io.IOException; import java.io.InputStream; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/Token.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/Token.java index 81a10c85b13..12f922129f3 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/Token.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/Token.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja; + import org.apache.lucene.analysis.ja.JapaneseTokenizer.Type; import org.apache.lucene.analysis.ja.dict.Dictionary; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/BinaryDictionary.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/BinaryDictionary.java index 393faeecf76..180c0a9327a 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/BinaryDictionary.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/BinaryDictionary.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja.dict; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja.dict; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja.dict; + import java.io.BufferedInputStream; import java.io.EOFException; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/CharacterDefinition.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/CharacterDefinition.java index e153ef27a4e..955659c7361 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/CharacterDefinition.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/CharacterDefinition.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja.dict; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja.dict; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja.dict; + import java.io.BufferedInputStream; import java.io.IOException; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/ConnectionCosts.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/ConnectionCosts.java index 6c354c018d4..96cf1b591fd 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/ConnectionCosts.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/ConnectionCosts.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja.dict; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja.dict; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja.dict; + import java.io.BufferedInputStream; import java.io.IOException; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/Dictionary.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/Dictionary.java index 56ffec93280..38f3b6e6358 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/Dictionary.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/Dictionary.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja.dict; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja.dict; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja.dict; + /** * Dictionary interface for retrieving morphological data diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoDictionary.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoDictionary.java index bc0ccd510f8..6b7513806c5 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoDictionary.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoDictionary.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja.dict; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja.dict; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja.dict; + import java.io.BufferedInputStream; import java.io.InputStream; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoFST.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoFST.java index dfeae8ccb02..30ae1f98b9f 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoFST.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/TokenInfoFST.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja.dict; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja.dict; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja.dict; + import java.io.IOException; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/UnknownDictionary.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/UnknownDictionary.java index 185f0abe080..ed5d39a2168 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/UnknownDictionary.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/UnknownDictionary.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja.dict; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja.dict; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja.dict; + import java.io.IOException; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/UserDictionary.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/UserDictionary.java index 3e72745120b..c8ab8d71c4d 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/UserDictionary.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/UserDictionary.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja.dict; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja.dict; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja.dict; + import java.io.BufferedReader; import java.io.IOException; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/package-info.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/package-info.java index 284c2d6cfa6..ef3bd10957a 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/package-info.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Kuromoji dictionary implementation. */ diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/package-info.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/package-info.java index b000563953b..692ad2c4b8b 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/package-info.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analyzer for Japanese. */ diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/BaseFormAttribute.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/BaseFormAttribute.java index 917f5e204a4..594d966ea34 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/BaseFormAttribute.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/BaseFormAttribute.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja.tokenattributes; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja.tokenattributes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja.tokenattributes; + import org.apache.lucene.analysis.ja.Token; import org.apache.lucene.util.Attribute; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/BaseFormAttributeImpl.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/BaseFormAttributeImpl.java index 1e3f789885f..f6e6e36aacc 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/BaseFormAttributeImpl.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/BaseFormAttributeImpl.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja.tokenattributes; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja.tokenattributes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja.tokenattributes; + import org.apache.lucene.analysis.ja.Token; import org.apache.lucene.util.AttributeImpl; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/InflectionAttribute.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/InflectionAttribute.java index d171b75c104..61450e95910 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/InflectionAttribute.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/InflectionAttribute.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja.tokenattributes; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja.tokenattributes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja.tokenattributes; + import org.apache.lucene.analysis.ja.Token; import org.apache.lucene.util.Attribute; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/InflectionAttributeImpl.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/InflectionAttributeImpl.java index e4e226dfa57..83a4c738e18 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/InflectionAttributeImpl.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/InflectionAttributeImpl.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja.tokenattributes; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja.tokenattributes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja.tokenattributes; + import org.apache.lucene.analysis.ja.Token; import org.apache.lucene.analysis.ja.util.ToStringUtil; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/PartOfSpeechAttribute.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/PartOfSpeechAttribute.java index 2644379d897..6bec3ef809f 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/PartOfSpeechAttribute.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/PartOfSpeechAttribute.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja.tokenattributes; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja.tokenattributes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja.tokenattributes; + import org.apache.lucene.analysis.ja.Token; import org.apache.lucene.util.Attribute; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/PartOfSpeechAttributeImpl.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/PartOfSpeechAttributeImpl.java index 62100f7679a..e26219b0b4f 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/PartOfSpeechAttributeImpl.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/PartOfSpeechAttributeImpl.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja.tokenattributes; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja.tokenattributes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja.tokenattributes; + import org.apache.lucene.analysis.ja.Token; import org.apache.lucene.analysis.ja.util.ToStringUtil; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/ReadingAttribute.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/ReadingAttribute.java index 7ddac5f78d7..b5d4f48895c 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/ReadingAttribute.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/ReadingAttribute.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja.tokenattributes; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja.tokenattributes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja.tokenattributes; + import org.apache.lucene.analysis.ja.Token; import org.apache.lucene.util.Attribute; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/ReadingAttributeImpl.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/ReadingAttributeImpl.java index 7a89e034d81..d46cf876670 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/ReadingAttributeImpl.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/ReadingAttributeImpl.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja.tokenattributes; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja.tokenattributes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja.tokenattributes; + import org.apache.lucene.analysis.ja.Token; import org.apache.lucene.analysis.ja.util.ToStringUtil; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/package-info.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/package-info.java index 932871d386b..7ff68262d09 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/package-info.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Additional Kuromoji-specific Attributes for text analysis. */ diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/CSVUtil.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/CSVUtil.java index 4ce4fb002aa..6301d2c05ca 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/CSVUtil.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/CSVUtil.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja.util; + import java.util.ArrayList; import java.util.regex.Matcher; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/ToStringUtil.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/ToStringUtil.java index d5a62119bc5..d1cb487c533 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/ToStringUtil.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/ToStringUtil.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja.util; + import java.io.IOException; import java.util.HashMap; diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/package-info.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/package-info.java index 28558b3d4f9..d3ae36573ec 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/package-info.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Kuromoji utility classes. */ diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/StringMockResourceLoader.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/StringMockResourceLoader.java index 611b2025f81..61a8a85b12c 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/StringMockResourceLoader.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/StringMockResourceLoader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja; + import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestExtendedMode.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestExtendedMode.java index 2bbbf52eb44..e4a9711231e 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestExtendedMode.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestExtendedMode.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja; + import java.io.IOException; import java.util.Random; diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseAnalyzer.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseAnalyzer.java index b31e4b00eef..e5b5b40f58b 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseAnalyzer.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja; + import java.io.IOException; import java.util.Random; diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseBaseFormFilter.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseBaseFormFilter.java index 68488dc7e40..b9ebd363753 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseBaseFormFilter.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseBaseFormFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja; + import java.io.IOException; diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseBaseFormFilterFactory.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseBaseFormFilterFactory.java index 8c996ba6ebd..b140516d662 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseBaseFormFilterFactory.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseBaseFormFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja; + import java.io.IOException; import java.io.StringReader; diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseIterationMarkCharFilter.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseIterationMarkCharFilter.java index 5a68a14eee1..955d3d95d69 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseIterationMarkCharFilter.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseIterationMarkCharFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja; + import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.BaseTokenStreamTestCase; diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseIterationMarkCharFilterFactory.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseIterationMarkCharFilterFactory.java index 00d29f556ff..fe5ae6659c7 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseIterationMarkCharFilterFactory.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseIterationMarkCharFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja; + import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.CharFilter; diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseKatakanaStemFilter.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseKatakanaStemFilter.java index 9720f61580e..bd14be36d5e 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseKatakanaStemFilter.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseKatakanaStemFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja; + import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.BaseTokenStreamTestCase; diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseKatakanaStemFilterFactory.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseKatakanaStemFilterFactory.java index a599271919c..6a112e76a0f 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseKatakanaStemFilterFactory.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseKatakanaStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja; + import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseNumberFilter.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseNumberFilter.java index b04364dc9a5..27cef339d9d 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseNumberFilter.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseNumberFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseNumberFilterFactory.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseNumberFilterFactory.java index 6e662672285..44e32346dce 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseNumberFilterFactory.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseNumberFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja; + import java.io.IOException; import java.io.StringReader; diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapanesePartOfSpeechStopFilterFactory.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapanesePartOfSpeechStopFilterFactory.java index ec7f16e6c54..979fd7f67f1 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapanesePartOfSpeechStopFilterFactory.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapanesePartOfSpeechStopFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja; + import java.io.IOException; import java.io.StringReader; diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseReadingFormFilter.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseReadingFormFilter.java index dfc6d13d58f..d993b3b3aa6 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseReadingFormFilter.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseReadingFormFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja; + import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.BaseTokenStreamTestCase; diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseReadingFormFilterFactory.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseReadingFormFilterFactory.java index bf4ba4ccd96..1b12ec1710c 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseReadingFormFilterFactory.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseReadingFormFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja; + import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenStream; diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java index a707dc7fb03..eb3a2c85e78 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja; + import java.io.IOException; import java.io.InputStream; diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizerFactory.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizerFactory.java index 1d63c6f46d6..45bf6034c1c 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizerFactory.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizerFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja; + import java.io.IOException; import java.io.StringReader; diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestSearchMode.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestSearchMode.java index 17f8269dcff..ee47f9143eb 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestSearchMode.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestSearchMode.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja; + import java.io.FileNotFoundException; import java.io.IOException; diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TestTokenInfoDictionary.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TestTokenInfoDictionary.java index 3caa14fafdb..eab4ec385f6 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TestTokenInfoDictionary.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/TestTokenInfoDictionary.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja.dict; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja.dict; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja.dict; + import org.apache.lucene.analysis.ja.util.ToStringUtil; import org.apache.lucene.util.IntsRef; diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/UserDictionaryTest.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/UserDictionaryTest.java index 75177f95af6..88a366f87f5 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/UserDictionaryTest.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/dict/UserDictionaryTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja.dict; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja.dict; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja.dict; + import java.io.IOException; diff --git a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/util/TestToStringUtil.java b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/util/TestToStringUtil.java index 57a759bb9cd..59e972f0d5e 100644 --- a/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/util/TestToStringUtil.java +++ b/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/util/TestToStringUtil.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja.util; + import java.util.HashMap; import java.util.Map; diff --git a/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/BinaryDictionaryWriter.java b/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/BinaryDictionaryWriter.java index 5c6a260a081..a6d48cc8bba 100644 --- a/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/BinaryDictionaryWriter.java +++ b/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/BinaryDictionaryWriter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja.util; + import java.io.BufferedOutputStream; import java.io.File; diff --git a/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/CharacterDefinitionWriter.java b/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/CharacterDefinitionWriter.java index 678d24d0151..deed5afe22e 100644 --- a/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/CharacterDefinitionWriter.java +++ b/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/CharacterDefinitionWriter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja.util; + import java.io.BufferedOutputStream; import java.io.File; diff --git a/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/ConnectionCostsBuilder.java b/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/ConnectionCostsBuilder.java index bdabdb6b8d8..e30d555b685 100644 --- a/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/ConnectionCostsBuilder.java +++ b/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/ConnectionCostsBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja.util; + import java.io.FileInputStream; import java.io.IOException; diff --git a/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/ConnectionCostsWriter.java b/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/ConnectionCostsWriter.java index 0fbc0bb415d..54382edce03 100644 --- a/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/ConnectionCostsWriter.java +++ b/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/ConnectionCostsWriter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja.util; + import java.io.BufferedOutputStream; import java.io.File; diff --git a/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/DictionaryBuilder.java b/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/DictionaryBuilder.java index ea366296465..ed9868b987a 100644 --- a/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/DictionaryBuilder.java +++ b/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/DictionaryBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja.util; + import java.io.File; import java.io.IOException; diff --git a/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/TokenInfoDictionaryBuilder.java b/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/TokenInfoDictionaryBuilder.java index 70bca2ed6ae..61d6f270226 100644 --- a/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/TokenInfoDictionaryBuilder.java +++ b/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/TokenInfoDictionaryBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja.util; + import java.io.BufferedReader; import java.io.File; diff --git a/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/TokenInfoDictionaryWriter.java b/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/TokenInfoDictionaryWriter.java index 315ace9ef85..6c2a28caa99 100644 --- a/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/TokenInfoDictionaryWriter.java +++ b/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/TokenInfoDictionaryWriter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja.util; + import java.io.IOException; import java.nio.file.Files; diff --git a/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/UnknownDictionaryBuilder.java b/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/UnknownDictionaryBuilder.java index d1dced97fea..f4b7e1376b3 100644 --- a/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/UnknownDictionaryBuilder.java +++ b/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/UnknownDictionaryBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja.util; + import java.io.File; import java.io.FileInputStream; diff --git a/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/UnknownDictionaryWriter.java b/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/UnknownDictionaryWriter.java index 4c3a616d786..a5819f95ff9 100644 --- a/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/UnknownDictionaryWriter.java +++ b/lucene/analysis/kuromoji/src/tools/java/org/apache/lucene/analysis/ja/util/UnknownDictionaryWriter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja.util; + import java.io.IOException; diff --git a/lucene/analysis/kuromoji/src/tools/test/org/apache/lucene/analysis/ja/dict/UnknownDictionaryTest.java b/lucene/analysis/kuromoji/src/tools/test/org/apache/lucene/analysis/ja/dict/UnknownDictionaryTest.java index bc1b70262e6..299e8c6eafc 100644 --- a/lucene/analysis/kuromoji/src/tools/test/org/apache/lucene/analysis/ja/dict/UnknownDictionaryTest.java +++ b/lucene/analysis/kuromoji/src/tools/test/org/apache/lucene/analysis/ja/dict/UnknownDictionaryTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.ja.dict; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.ja.dict; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.ja.dict; + import org.apache.lucene.analysis.ja.util.CSVUtil; import org.apache.lucene.analysis.ja.util.UnknownDictionaryWriter; diff --git a/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikAnalyzer.java b/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikAnalyzer.java index 3a07351d269..091acfdaf03 100644 --- a/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikAnalyzer.java +++ b/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikAnalyzer.java @@ -1,6 +1,4 @@ // -*- c-basic-offset: 2 -*- -package org.apache.lucene.analysis.morfologik; - /* * 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.lucene.analysis.morfologik; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.morfologik; import java.io.Reader; diff --git a/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikFilter.java b/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikFilter.java index f5b51453622..ff36dbecd43 100644 --- a/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikFilter.java +++ b/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.morfologik; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.morfologik; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.morfologik; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikFilterFactory.java b/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikFilterFactory.java index e3b6676e589..d005dc55b50 100644 --- a/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikFilterFactory.java +++ b/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorfologikFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.morfologik; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.morfologik; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.morfologik; + import java.io.IOException; import java.io.InputStream; diff --git a/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorphosyntacticTagsAttribute.java b/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorphosyntacticTagsAttribute.java index 117be78e869..c827d9d6fa0 100644 --- a/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorphosyntacticTagsAttribute.java +++ b/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorphosyntacticTagsAttribute.java @@ -1,6 +1,4 @@ // -*- c-basic-offset: 2 -*- -package org.apache.lucene.analysis.morfologik; - /* * 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.lucene.analysis.morfologik; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.morfologik; import java.util.List; diff --git a/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorphosyntacticTagsAttributeImpl.java b/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorphosyntacticTagsAttributeImpl.java index a3e724c5f68..c42f56b2330 100644 --- a/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorphosyntacticTagsAttributeImpl.java +++ b/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/MorphosyntacticTagsAttributeImpl.java @@ -1,6 +1,4 @@ // -*- c-basic-offset: 2 -*- -package org.apache.lucene.analysis.morfologik; - /* * 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.lucene.analysis.morfologik; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.morfologik; import java.util.*; diff --git a/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/package-info.java b/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/package-info.java index 9d58e1d44d1..a828fdebc95 100644 --- a/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/package-info.java +++ b/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * This package provides dictionary-driven lemmatization ("accurate stemming") * filter and analyzer for the Polish Language, driven by the diff --git a/lucene/analysis/morfologik/src/test/org/apache/lucene/analysis/morfologik/TestMorfologikAnalyzer.java b/lucene/analysis/morfologik/src/test/org/apache/lucene/analysis/morfologik/TestMorfologikAnalyzer.java index 1fa45918fb5..d8967c7678b 100644 --- a/lucene/analysis/morfologik/src/test/org/apache/lucene/analysis/morfologik/TestMorfologikAnalyzer.java +++ b/lucene/analysis/morfologik/src/test/org/apache/lucene/analysis/morfologik/TestMorfologikAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.morfologik; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.morfologik; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.morfologik; + import java.io.IOException; import java.util.TreeSet; diff --git a/lucene/analysis/morfologik/src/test/org/apache/lucene/analysis/morfologik/TestMorfologikFilterFactory.java b/lucene/analysis/morfologik/src/test/org/apache/lucene/analysis/morfologik/TestMorfologikFilterFactory.java index e505e189758..9a597fc3af1 100644 --- a/lucene/analysis/morfologik/src/test/org/apache/lucene/analysis/morfologik/TestMorfologikFilterFactory.java +++ b/lucene/analysis/morfologik/src/test/org/apache/lucene/analysis/morfologik/TestMorfologikFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.morfologik; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.morfologik; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.morfologik; + import java.io.IOException; import java.io.InputStream; diff --git a/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/BeiderMorseFilter.java b/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/BeiderMorseFilter.java index f199108317f..f0ddc415de4 100644 --- a/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/BeiderMorseFilter.java +++ b/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/BeiderMorseFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.phonetic; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.phonetic; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.phonetic; + import java.io.IOException; import java.util.regex.Matcher; diff --git a/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/BeiderMorseFilterFactory.java b/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/BeiderMorseFilterFactory.java index 81190b78785..5a78204e532 100644 --- a/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/BeiderMorseFilterFactory.java +++ b/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/BeiderMorseFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.phonetic; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.phonetic; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.phonetic; + import java.util.Map; import java.util.Set; diff --git a/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/DaitchMokotoffSoundexFilter.java b/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/DaitchMokotoffSoundexFilter.java index a27bebf3566..5699b861d41 100644 --- a/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/DaitchMokotoffSoundexFilter.java +++ b/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/DaitchMokotoffSoundexFilter.java @@ -6,7 +6,7 @@ * (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 + * 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, diff --git a/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/DaitchMokotoffSoundexFilterFactory.java b/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/DaitchMokotoffSoundexFilterFactory.java index aa2d3d52c85..16131f3196d 100644 --- a/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/DaitchMokotoffSoundexFilterFactory.java +++ b/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/DaitchMokotoffSoundexFilterFactory.java @@ -6,7 +6,7 @@ * (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 + * 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, diff --git a/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/DoubleMetaphoneFilterFactory.java b/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/DoubleMetaphoneFilterFactory.java index 478b123bf92..fdaecb2a1ad 100644 --- a/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/DoubleMetaphoneFilterFactory.java +++ b/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/DoubleMetaphoneFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.phonetic; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.phonetic; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.phonetic; + import java.util.Map; diff --git a/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/PhoneticFilter.java b/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/PhoneticFilter.java index be2dabf62ae..9b3893fc6e6 100644 --- a/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/PhoneticFilter.java +++ b/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/PhoneticFilter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.phonetic; import org.apache.commons.codec.Encoder; diff --git a/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/PhoneticFilterFactory.java b/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/PhoneticFilterFactory.java index 8bf80b8edbd..fc69a61f123 100644 --- a/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/PhoneticFilterFactory.java +++ b/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/PhoneticFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.phonetic; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.phonetic; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.phonetic; + import java.io.IOException; import java.lang.reflect.InvocationTargetException; diff --git a/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/package-info.java b/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/package-info.java index c710c9880b1..5aa2535a941 100644 --- a/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/package-info.java +++ b/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analysis components for phonetic search. */ diff --git a/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestBeiderMorseFilter.java b/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestBeiderMorseFilter.java index 126f66928db..c2af5629119 100644 --- a/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestBeiderMorseFilter.java +++ b/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestBeiderMorseFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.phonetic; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.phonetic; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.phonetic; + import java.io.IOException; import java.io.StringReader; diff --git a/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestBeiderMorseFilterFactory.java b/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestBeiderMorseFilterFactory.java index ece793f0be0..c29a9b43425 100644 --- a/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestBeiderMorseFilterFactory.java +++ b/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestBeiderMorseFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.phonetic; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.phonetic; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.phonetic; + import java.util.HashMap; import java.util.Map; diff --git a/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDaitchMokotoffSoundexFilter.java b/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDaitchMokotoffSoundexFilter.java index ed28022d773..259ce1f3937 100644 --- a/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDaitchMokotoffSoundexFilter.java +++ b/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDaitchMokotoffSoundexFilter.java @@ -6,7 +6,7 @@ * (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 + * 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, diff --git a/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDaitchMokotoffSoundexFilterFactory.java b/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDaitchMokotoffSoundexFilterFactory.java index 8dc74e002d0..b73deb356ba 100644 --- a/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDaitchMokotoffSoundexFilterFactory.java +++ b/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDaitchMokotoffSoundexFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.phonetic; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.phonetic; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.phonetic; + import java.io.StringReader; import java.util.HashMap; diff --git a/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDoubleMetaphoneFilterFactory.java b/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDoubleMetaphoneFilterFactory.java index ca1ba05a55b..24c8e1460d4 100644 --- a/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDoubleMetaphoneFilterFactory.java +++ b/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestDoubleMetaphoneFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.phonetic; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.phonetic; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.phonetic; + import java.io.StringReader; import java.util.HashMap; diff --git a/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestPhoneticFilter.java b/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestPhoneticFilter.java index ade1fd9f419..076a610abec 100644 --- a/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestPhoneticFilter.java +++ b/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestPhoneticFilter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.phonetic; import java.io.IOException; diff --git a/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestPhoneticFilterFactory.java b/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestPhoneticFilterFactory.java index 70b654d580d..ff20b652caa 100644 --- a/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestPhoneticFilterFactory.java +++ b/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestPhoneticFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.phonetic; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.phonetic; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.phonetic; + import java.io.IOException; import java.util.HashMap; diff --git a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/AnalyzerProfile.java b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/AnalyzerProfile.java index 6a6f45759be..aa2b847be89 100644 --- a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/AnalyzerProfile.java +++ b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/AnalyzerProfile.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.cn.smart; import java.io.BufferedReader; diff --git a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/CharType.java b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/CharType.java index 81ec4a085b5..4ad58779622 100644 --- a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/CharType.java +++ b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/CharType.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.cn.smart; /** diff --git a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/HMMChineseTokenizer.java b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/HMMChineseTokenizer.java index ba7e8688729..573df93cba3 100644 --- a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/HMMChineseTokenizer.java +++ b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/HMMChineseTokenizer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.cn.smart; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.cn.smart; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.cn.smart; + import java.io.IOException; import java.text.BreakIterator; diff --git a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/HMMChineseTokenizerFactory.java b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/HMMChineseTokenizerFactory.java index 8d537aa89ce..43cb8229a7b 100644 --- a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/HMMChineseTokenizerFactory.java +++ b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/HMMChineseTokenizerFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.cn.smart; import java.util.Map; diff --git a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SmartChineseAnalyzer.java b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SmartChineseAnalyzer.java index 811344328a4..bd1fc7b85ca 100644 --- a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SmartChineseAnalyzer.java +++ b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SmartChineseAnalyzer.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.cn.smart; import java.io.IOException; diff --git a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/Utility.java b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/Utility.java index bd1b006c00b..aca80e7eb56 100644 --- a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/Utility.java +++ b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/Utility.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.cn.smart; import org.apache.lucene.analysis.cn.smart.hhmm.SegTokenFilter; // for javadoc diff --git a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/WordSegmenter.java b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/WordSegmenter.java index bf88bd40ab1..475238bbb9b 100644 --- a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/WordSegmenter.java +++ b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/WordSegmenter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.cn.smart; import java.util.Collections; diff --git a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/WordType.java b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/WordType.java index 57da1ae40c6..9fff971751b 100644 --- a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/WordType.java +++ b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/WordType.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.cn.smart; /** diff --git a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/AbstractDictionary.java b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/AbstractDictionary.java index 7d3622a3a7c..bbce1a8497e 100644 --- a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/AbstractDictionary.java +++ b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/AbstractDictionary.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.cn.smart.hhmm; import java.io.UnsupportedEncodingException; diff --git a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/BiSegGraph.java b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/BiSegGraph.java index c3b91869386..33074983543 100644 --- a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/BiSegGraph.java +++ b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/BiSegGraph.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.cn.smart.hhmm; import java.util.ArrayList; diff --git a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/BigramDictionary.java b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/BigramDictionary.java index 1a14dd0e8f2..11ce03b6c72 100644 --- a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/BigramDictionary.java +++ b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/BigramDictionary.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.cn.smart.hhmm; import java.io.DataInputStream; diff --git a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/HHMMSegmenter.java b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/HHMMSegmenter.java index 14061b9a999..bd691900e12 100644 --- a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/HHMMSegmenter.java +++ b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/HHMMSegmenter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.cn.smart.hhmm; import java.util.List; diff --git a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/PathNode.java b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/PathNode.java index 573c67979ba..f216f9818dd 100644 --- a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/PathNode.java +++ b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/PathNode.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.cn.smart.hhmm; /** diff --git a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegGraph.java b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegGraph.java index 9c1f95a1935..a6f38b31759 100644 --- a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegGraph.java +++ b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegGraph.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.cn.smart.hhmm; import java.util.ArrayList; diff --git a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegToken.java b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegToken.java index d7990c00dee..e0c7b9dc1fa 100644 --- a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegToken.java +++ b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegToken.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.cn.smart.hhmm; import java.util.Arrays; diff --git a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegTokenFilter.java b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegTokenFilter.java index 9f119ef5234..01b70b9f0e5 100644 --- a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegTokenFilter.java +++ b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegTokenFilter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.cn.smart.hhmm; import org.apache.lucene.analysis.cn.smart.Utility; diff --git a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegTokenPair.java b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegTokenPair.java index 8c4ad3e7b3d..a943f05e727 100644 --- a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegTokenPair.java +++ b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegTokenPair.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.cn.smart.hhmm; import java.util.Arrays; diff --git a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/WordDictionary.java b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/WordDictionary.java index 7d7e9050ec2..9e5d41652aa 100644 --- a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/WordDictionary.java +++ b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/WordDictionary.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.cn.smart.hhmm; import java.io.DataInputStream; diff --git a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/package-info.java b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/package-info.java index 37d38b04ed1..55ea61169b3 100644 --- a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/package-info.java +++ b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * SmartChineseAnalyzer Hidden Markov Model package. * @lucene.experimental diff --git a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/package-info.java b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/package-info.java index d273a363922..a365e1b76f1 100644 --- a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/package-info.java +++ b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analyzer for Simplified Chinese, which indexes words. * @lucene.experimental diff --git a/lucene/analysis/smartcn/src/test/org/apache/lucene/analysis/cn/smart/TestHMMChineseTokenizerFactory.java b/lucene/analysis/smartcn/src/test/org/apache/lucene/analysis/cn/smart/TestHMMChineseTokenizerFactory.java index 619f8689d33..e16a4fe628d 100644 --- a/lucene/analysis/smartcn/src/test/org/apache/lucene/analysis/cn/smart/TestHMMChineseTokenizerFactory.java +++ b/lucene/analysis/smartcn/src/test/org/apache/lucene/analysis/cn/smart/TestHMMChineseTokenizerFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.cn.smart; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.cn.smart; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.cn.smart; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/smartcn/src/test/org/apache/lucene/analysis/cn/smart/TestSmartChineseAnalyzer.java b/lucene/analysis/smartcn/src/test/org/apache/lucene/analysis/cn/smart/TestSmartChineseAnalyzer.java index 940c6c5265c..6460fbd8423 100644 --- a/lucene/analysis/smartcn/src/test/org/apache/lucene/analysis/cn/smart/TestSmartChineseAnalyzer.java +++ b/lucene/analysis/smartcn/src/test/org/apache/lucene/analysis/cn/smart/TestSmartChineseAnalyzer.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.analysis.cn.smart; import org.apache.lucene.analysis.BaseTokenStreamTestCase; diff --git a/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/pl/PolishAnalyzer.java b/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/pl/PolishAnalyzer.java index 7ac5bc14ef8..999ce86b4f7 100644 --- a/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/pl/PolishAnalyzer.java +++ b/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/pl/PolishAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.pl; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.pl; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.pl; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/pl/package-info.java b/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/pl/package-info.java index 6a6cc80acb2..733dda4e460 100644 --- a/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/pl/package-info.java +++ b/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/pl/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analyzer for Polish. */ diff --git a/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelFilter.java b/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelFilter.java index 1ea242fad51..3af593f462d 100644 --- a/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelFilter.java +++ b/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelFilter.java @@ -1,19 +1,19 @@ /* - * Copyright 2004 The Apache Software Foundation - * - * Licensed 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 - * + * 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. + * 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.analysis.stempel; import java.io.IOException; diff --git a/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelPolishStemFilterFactory.java b/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelPolishStemFilterFactory.java index 0656edd97d5..25cc4bb657a 100644 --- a/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelPolishStemFilterFactory.java +++ b/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelPolishStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.stempel; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.stempel; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.stempel; + import java.util.Map; diff --git a/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelStemmer.java b/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelStemmer.java index 9c510ec1902..fc6e198d0d5 100644 --- a/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelStemmer.java +++ b/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/StempelStemmer.java @@ -1,19 +1,19 @@ /* - * Copyright 2004 The Apache Software Foundation - * - * Licensed 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 - * + * 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. + * 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.analysis.stempel; import java.io.BufferedInputStream; diff --git a/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/package-info.java b/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/package-info.java index db125cd8d75..855a7f8c449 100644 --- a/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/package-info.java +++ b/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Stempel: Algorithmic Stemmer */ diff --git a/lucene/analysis/stempel/src/java/org/egothor/stemmer/package-info.java b/lucene/analysis/stempel/src/java/org/egothor/stemmer/package-info.java index 395aa659d13..f60c1f74d08 100644 --- a/lucene/analysis/stempel/src/java/org/egothor/stemmer/package-info.java +++ b/lucene/analysis/stempel/src/java/org/egothor/stemmer/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Egothor stemmer API. */ diff --git a/lucene/analysis/stempel/src/test/org/apache/lucene/analysis/pl/TestPolishAnalyzer.java b/lucene/analysis/stempel/src/test/org/apache/lucene/analysis/pl/TestPolishAnalyzer.java index 483a9804117..b0ef008b5aa 100644 --- a/lucene/analysis/stempel/src/test/org/apache/lucene/analysis/pl/TestPolishAnalyzer.java +++ b/lucene/analysis/stempel/src/test/org/apache/lucene/analysis/pl/TestPolishAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.pl; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.pl; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.pl; + import java.io.IOException; diff --git a/lucene/analysis/stempel/src/test/org/apache/lucene/analysis/stempel/TestStempelPolishStemFilterFactory.java b/lucene/analysis/stempel/src/test/org/apache/lucene/analysis/stempel/TestStempelPolishStemFilterFactory.java index 4396444cde9..cfb022bd61d 100644 --- a/lucene/analysis/stempel/src/test/org/apache/lucene/analysis/stempel/TestStempelPolishStemFilterFactory.java +++ b/lucene/analysis/stempel/src/test/org/apache/lucene/analysis/stempel/TestStempelPolishStemFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.stempel; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.stempel; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.stempel; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/BaseUIMATokenizer.java b/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/BaseUIMATokenizer.java index cd1d376c28a..78b88dc81e9 100644 --- a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/BaseUIMATokenizer.java +++ b/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/BaseUIMATokenizer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.uima; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.uima; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.uima; + import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.uima.ae.AEProviderFactory; diff --git a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMAAnnotationsTokenizer.java b/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMAAnnotationsTokenizer.java index c0d7389a14e..169be5f4ec4 100644 --- a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMAAnnotationsTokenizer.java +++ b/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMAAnnotationsTokenizer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.uima; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.uima; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.uima; + import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; diff --git a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMAAnnotationsTokenizerFactory.java b/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMAAnnotationsTokenizerFactory.java index 76bceb7698d..54e71d7bed3 100644 --- a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMAAnnotationsTokenizerFactory.java +++ b/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMAAnnotationsTokenizerFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.uima; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.uima; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.uima; + import org.apache.lucene.analysis.util.TokenizerFactory; import org.apache.lucene.util.AttributeFactory; diff --git a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMABaseAnalyzer.java b/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMABaseAnalyzer.java index 0de1fa49c53..5cb4a0174d0 100644 --- a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMABaseAnalyzer.java +++ b/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMABaseAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.uima; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.uima; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.uima; + import org.apache.lucene.analysis.Analyzer; diff --git a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMATypeAwareAnalyzer.java b/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMATypeAwareAnalyzer.java index 0a9c73c7341..9d3a7d71ad6 100644 --- a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMATypeAwareAnalyzer.java +++ b/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMATypeAwareAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.uima; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.uima; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.uima; + import org.apache.lucene.analysis.Analyzer; diff --git a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMATypeAwareAnnotationsTokenizer.java b/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMATypeAwareAnnotationsTokenizer.java index fbf1d8e8293..870086a2341 100644 --- a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMATypeAwareAnnotationsTokenizer.java +++ b/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMATypeAwareAnnotationsTokenizer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.uima; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.uima; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.uima; + import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; diff --git a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMATypeAwareAnnotationsTokenizerFactory.java b/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMATypeAwareAnnotationsTokenizerFactory.java index f3dabed5b8c..b1a6d20d12b 100644 --- a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMATypeAwareAnnotationsTokenizerFactory.java +++ b/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/UIMATypeAwareAnnotationsTokenizerFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.uima; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.uima; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.uima; + import org.apache.lucene.analysis.util.TokenizerFactory; import org.apache.lucene.util.AttributeFactory; diff --git a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/AEProvider.java b/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/AEProvider.java index ba102d278da..12dc2f036c3 100644 --- a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/AEProvider.java +++ b/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/AEProvider.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.uima.ae; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.uima.ae; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.uima.ae; + import org.apache.uima.analysis_engine.AnalysisEngine; import org.apache.uima.resource.ResourceInitializationException; diff --git a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/AEProviderFactory.java b/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/AEProviderFactory.java index 1a3e2bec8e6..cfa642f78eb 100644 --- a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/AEProviderFactory.java +++ b/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/AEProviderFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.uima.ae; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.uima.ae; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.uima.ae; + import java.util.HashMap; import java.util.Map; diff --git a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/BasicAEProvider.java b/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/BasicAEProvider.java index 300201d7b4d..d5533226799 100644 --- a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/BasicAEProvider.java +++ b/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/BasicAEProvider.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.uima.ae; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.uima.ae; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.uima.ae; + import java.io.IOException; diff --git a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/OverridingParamsAEProvider.java b/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/OverridingParamsAEProvider.java index e740706ff02..67ccb7a3f73 100644 --- a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/OverridingParamsAEProvider.java +++ b/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/OverridingParamsAEProvider.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.uima.ae; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.uima.ae; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.uima.ae; + import org.apache.uima.analysis_engine.AnalysisEngineDescription; diff --git a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/package-info.java b/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/package-info.java index e08da29bbb6..f883099e96f 100644 --- a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/package-info.java +++ b/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Integration with UIMA's AnalysisEngine. */ diff --git a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/package-info.java b/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/package-info.java index 0baa0fc8530..ffa5b48c367 100644 --- a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/package-info.java +++ b/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Classes that integrate UIMA with Lucene's analysis API. */ diff --git a/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java b/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java index eb13746d894..5ad24ae5f90 100644 --- a/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java +++ b/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMABaseAnalyzerTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.uima; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.uima; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.uima; + import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.BaseTokenStreamTestCase; diff --git a/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMATypeAwareAnalyzerTest.java b/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMATypeAwareAnalyzerTest.java index 96e30dabcb0..1ba717bb36e 100644 --- a/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMATypeAwareAnalyzerTest.java +++ b/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/UIMATypeAwareAnalyzerTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.uima; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.uima; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.uima; + import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.BaseTokenStreamTestCase; diff --git a/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/ae/AEProviderFactoryTest.java b/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/ae/AEProviderFactoryTest.java index 66f15c24dba..047e1199c51 100644 --- a/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/ae/AEProviderFactoryTest.java +++ b/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/ae/AEProviderFactoryTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.uima.ae; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.uima.ae; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.uima.ae; + import org.junit.Test; diff --git a/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/ae/BasicAEProviderTest.java b/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/ae/BasicAEProviderTest.java index 3fe46addd8a..1d8b2518d5a 100644 --- a/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/ae/BasicAEProviderTest.java +++ b/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/ae/BasicAEProviderTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.uima.ae; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.uima.ae; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.uima.ae; + import org.apache.uima.analysis_engine.AnalysisEngine; import org.junit.Test; diff --git a/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/ae/OverridingParamsAEProviderTest.java b/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/ae/OverridingParamsAEProviderTest.java index ee0f4b5c26b..8f7e1118e11 100644 --- a/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/ae/OverridingParamsAEProviderTest.java +++ b/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/ae/OverridingParamsAEProviderTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.uima.ae; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.uima.ae; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.uima.ae; + import org.apache.uima.analysis_engine.AnalysisEngine; import org.apache.uima.resource.ResourceInitializationException; diff --git a/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/an/SampleEntityAnnotator.java b/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/an/SampleEntityAnnotator.java index 319380b0f0d..9189ba1797b 100644 --- a/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/an/SampleEntityAnnotator.java +++ b/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/an/SampleEntityAnnotator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.uima.an; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.uima.an; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.uima.an; + import org.apache.uima.TokenAnnotation; import org.apache.uima.analysis_component.JCasAnnotator_ImplBase; diff --git a/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/an/SamplePoSTagger.java b/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/an/SamplePoSTagger.java index 6ff1468dc98..520b1a98107 100644 --- a/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/an/SamplePoSTagger.java +++ b/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/an/SamplePoSTagger.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.uima.an; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.uima.an; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.uima.an; + import org.apache.uima.analysis_component.JCasAnnotator_ImplBase; import org.apache.uima.analysis_engine.AnalysisEngineProcessException; diff --git a/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/an/SampleWSTokenizerAnnotator.java b/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/an/SampleWSTokenizerAnnotator.java index 8f713b34b1f..3e0da24dbca 100644 --- a/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/an/SampleWSTokenizerAnnotator.java +++ b/lucene/analysis/uima/src/test/org/apache/lucene/analysis/uima/an/SampleWSTokenizerAnnotator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.uima.an; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.uima.an; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.uima.an; + import org.apache.uima.UimaContext; import org.apache.uima.analysis_component.JCasAnnotator_ImplBase; diff --git a/lucene/backward-codecs/src/java/org/apache/lucene/codecs/Placeholder.java b/lucene/backward-codecs/src/java/org/apache/lucene/codecs/Placeholder.java index 86b2351ddf0..b0c292b0348 100644 --- a/lucene/backward-codecs/src/java/org/apache/lucene/codecs/Placeholder.java +++ b/lucene/backward-codecs/src/java/org/apache/lucene/codecs/Placeholder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs; + /** Remove this file when adding back compat codecs */ public class Placeholder { diff --git a/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene50/Lucene50Codec.java b/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene50/Lucene50Codec.java index 95796745f3d..08ea3e9a35d 100644 --- a/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene50/Lucene50Codec.java +++ b/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene50/Lucene50Codec.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene50; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene50; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene50; + import java.util.Objects; diff --git a/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene50/Lucene50DocValuesConsumer.java b/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene50/Lucene50DocValuesConsumer.java index 7c8782259f3..59ce73a6b56 100644 --- a/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene50/Lucene50DocValuesConsumer.java +++ b/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene50/Lucene50DocValuesConsumer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene50; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene50; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene50; + import java.io.Closeable; // javadocs import java.io.IOException; diff --git a/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene50/Lucene50DocValuesFormat.java b/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene50/Lucene50DocValuesFormat.java index 3ad80244acb..7258a710f59 100644 --- a/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene50/Lucene50DocValuesFormat.java +++ b/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene50/Lucene50DocValuesFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene50; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene50; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene50; + import java.io.IOException; diff --git a/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene50/Lucene50DocValuesProducer.java b/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene50/Lucene50DocValuesProducer.java index d926768e6a3..c323d6eb923 100644 --- a/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene50/Lucene50DocValuesProducer.java +++ b/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene50/Lucene50DocValuesProducer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene50; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene50; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene50; + import java.io.Closeable; import java.io.IOException; diff --git a/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene50/Lucene50NormsFormat.java b/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene50/Lucene50NormsFormat.java index 06a50cef58b..786dcf2f84c 100644 --- a/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene50/Lucene50NormsFormat.java +++ b/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene50/Lucene50NormsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene50; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene50; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene50; + import java.io.IOException; diff --git a/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene50/Lucene50NormsProducer.java b/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene50/Lucene50NormsProducer.java index c4495f8589d..e087e27aca2 100644 --- a/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene50/Lucene50NormsProducer.java +++ b/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene50/Lucene50NormsProducer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene50; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene50; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene50; + import static org.apache.lucene.codecs.lucene50.Lucene50NormsFormat.CONST_COMPRESSED; import static org.apache.lucene.codecs.lucene50.Lucene50NormsFormat.DELTA_COMPRESSED; diff --git a/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene53/Lucene53Codec.java b/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene53/Lucene53Codec.java index 1ec140640f0..ab90306a020 100644 --- a/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene53/Lucene53Codec.java +++ b/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene53/Lucene53Codec.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene53; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene53; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene53; + import java.util.Objects; diff --git a/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene54/Lucene54Codec.java b/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene54/Lucene54Codec.java index 4ca25219545..62ef89cd958 100644 --- a/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene54/Lucene54Codec.java +++ b/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene54/Lucene54Codec.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene54; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene54; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene54; + import java.util.Objects; diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene50/Lucene50NormsConsumer.java b/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene50/Lucene50NormsConsumer.java index 119fbdaaf6d..5c779de3b6b 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene50/Lucene50NormsConsumer.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene50/Lucene50NormsConsumer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene50; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene50; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene50; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene50/Lucene50RWCodec.java b/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene50/Lucene50RWCodec.java index 5737d879327..359e2ec3d22 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene50/Lucene50RWCodec.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene50/Lucene50RWCodec.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene50; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene50; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene50; + import org.apache.lucene.codecs.NormsFormat; diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene50/Lucene50RWNormsFormat.java b/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene50/Lucene50RWNormsFormat.java index 22a80cac029..fcf07ef2bc1 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene50/Lucene50RWNormsFormat.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene50/Lucene50RWNormsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene50; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene50; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene50; + import java.io.IOException; diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene50/TestLucene50DocValuesFormat.java b/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene50/TestLucene50DocValuesFormat.java index 0112ecb431e..2c38728446c 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene50/TestLucene50DocValuesFormat.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene50/TestLucene50DocValuesFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene50; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene50; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene50; + import java.util.ArrayList; import java.util.Collections; diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene50/TestLucene50NormsFormat.java b/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene50/TestLucene50NormsFormat.java index 6e41e84d33c..5ea076dab81 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene50/TestLucene50NormsFormat.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene50/TestLucene50NormsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene50; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene50; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene50; + import java.util.HashMap; import java.util.HashSet; diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java b/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java index f61599da471..ce4fad5d9fd 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/TestMaxPositionInOldIndex.java b/lucene/backward-codecs/src/test/org/apache/lucene/index/TestMaxPositionInOldIndex.java index f5aafbd7f3b..37f8c21e0c3 100644 --- a/lucene/backward-codecs/src/test/org/apache/lucene/index/TestMaxPositionInOldIndex.java +++ b/lucene/backward-codecs/src/test/org/apache/lucene/index/TestMaxPositionInOldIndex.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.InputStream; import java.nio.file.Path; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/Constants.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/Constants.java index 750ab5ba2c9..b03cdcd16e8 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/Constants.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/Constants.java @@ -1,10 +1,10 @@ -package org.apache.lucene.benchmark; /* - * Copyright 2005 The Apache Software Foundation - * - * Licensed 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 + * 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 * @@ -14,14 +14,13 @@ package org.apache.lucene.benchmark; * See the License for the specific language governing permissions and * limitations under the License. */ - - +package org.apache.lucene.benchmark; /** * Various benchmarking constants (mostly defaults) **/ -public class Constants -{ +public class Constants { + public static final int DEFAULT_RUN_COUNT = 5; public static final int DEFAULT_SCALE_UP = 5; public static final int DEFAULT_LOG_STEP = 1000; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/Benchmark.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/Benchmark.java index be627f4c02f..1ea4cab4374 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/Benchmark.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/Benchmark.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask; + import java.io.Reader; import java.nio.charset.StandardCharsets; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/PerfRunData.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/PerfRunData.java index 0202ff605a7..1d4b6433a82 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/PerfRunData.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/PerfRunData.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask; + import java.io.Closeable; import java.io.IOException; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/AbstractQueryMaker.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/AbstractQueryMaker.java index 88103f2bf86..b40f4a91d46 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/AbstractQueryMaker.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/AbstractQueryMaker.java @@ -1,10 +1,10 @@ -package org.apache.lucene.benchmark.byTask.feeds; /* - * Copyright 2005 The Apache Software Foundation - * - * Licensed 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 + * 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 * @@ -14,6 +14,7 @@ package org.apache.lucene.benchmark.byTask.feeds; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.feeds; import org.apache.lucene.benchmark.byTask.utils.Config; import org.apache.lucene.search.Query; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ContentItemsSource.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ContentItemsSource.java index 459b1efb8a8..7e15083a27e 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ContentItemsSource.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ContentItemsSource.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.feeds; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.feeds; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.feeds; + import java.io.Closeable; import java.io.IOException; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ContentSource.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ContentSource.java index 86efbf6d29b..831e021d0ec 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ContentSource.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ContentSource.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.feeds; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.feeds; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.feeds; + import java.io.IOException; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DemoHTMLParser.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DemoHTMLParser.java index 1f76f8cebfe..a1e6a3c013f 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DemoHTMLParser.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DemoHTMLParser.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.feeds; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.feeds; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.feeds; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DirContentSource.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DirContentSource.java index 3950f9bc8d0..9eb54ea86e4 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DirContentSource.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DirContentSource.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.feeds; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.feeds; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.feeds; + import org.apache.lucene.benchmark.byTask.utils.Config; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocData.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocData.java index 557b386b033..9b1448abcf8 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocData.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocData.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.feeds; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.feeds; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.feeds; + import java.util.Date; import java.util.Properties; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java index bca057b2fe6..f2c863cf798 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.feeds; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.feeds; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.feeds; + import java.io.Closeable; import java.io.IOException; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSource.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSource.java index 768a253ccdf..a933e562789 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSource.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSource.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.feeds; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.feeds; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.feeds; + import java.io.IOException; import java.io.InputStream; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java index 374cce65e16..2e070c9d524 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiQueryMaker.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.feeds; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.feeds; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.feeds; + import java.util.ArrayList; import java.util.Arrays; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FacetSource.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FacetSource.java index 1e94543fea5..b6dec7c0b93 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FacetSource.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FacetSource.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.feeds; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.feeds; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.feeds; + import java.io.IOException; import java.util.List; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java index a10648d24ad..6e24947c860 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/FileBasedQueryMaker.java @@ -1,19 +1,19 @@ /* - * Copyright 2004 The Apache Software Foundation - *

- * Licensed 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 - *

+ * 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.benchmark.byTask.feeds; import org.apache.lucene.analysis.Analyzer; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/GeonamesLineParser.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/GeonamesLineParser.java index b7501318746..93867128bfb 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/GeonamesLineParser.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/GeonamesLineParser.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.feeds; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.feeds; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.feeds; + /** * A line parser for Geonames.org data. diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/HTMLParser.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/HTMLParser.java index 25fe210b653..9e3090a0d34 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/HTMLParser.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/HTMLParser.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.feeds; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.feeds; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.feeds; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LineDocSource.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LineDocSource.java index 9d70acfa176..cb164959369 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LineDocSource.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LineDocSource.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.feeds; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.feeds; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.feeds; + import java.io.BufferedReader; import java.io.IOException; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LongToEnglishContentSource.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LongToEnglishContentSource.java index 7d33d0c50b7..09264521726 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LongToEnglishContentSource.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LongToEnglishContentSource.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.feeds; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.feeds; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.feeds; + import java.io.IOException; import java.util.Date; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LongToEnglishQueryMaker.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LongToEnglishQueryMaker.java index 731155a5f65..35c079b94f2 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LongToEnglishQueryMaker.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/LongToEnglishQueryMaker.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.feeds; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.feeds; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.feeds; + import java.util.Locale; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/NoMoreDataException.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/NoMoreDataException.java index 11e48eada97..da095feafbc 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/NoMoreDataException.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/NoMoreDataException.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.feeds; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.feeds; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.feeds; + /** * Exception indicating there is no more data. diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/QueryMaker.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/QueryMaker.java index cf37ea6984b..92ca88b3408 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/QueryMaker.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/QueryMaker.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.feeds; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.feeds; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.feeds; + import org.apache.lucene.benchmark.byTask.utils.Config; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/RandomFacetSource.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/RandomFacetSource.java index 98000750273..61db19a539a 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/RandomFacetSource.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/RandomFacetSource.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.feeds; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.feeds; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.feeds; + import java.io.IOException; import java.util.List; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersContentSource.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersContentSource.java index 31d41a1cfb0..64d5e6ec0a2 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersContentSource.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersContentSource.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.feeds; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.feeds; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.feeds; + import java.io.BufferedReader; import java.io.IOException; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersQueryMaker.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersQueryMaker.java index 1a57a052d8a..3425f426f9a 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersQueryMaker.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersQueryMaker.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.feeds; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.feeds; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.feeds; + import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.index.Term; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleQueryMaker.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleQueryMaker.java index 7e11a65a1b4..824c76bc1f4 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleQueryMaker.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleQueryMaker.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.feeds; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.feeds; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.feeds; + import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.index.Term; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleSloppyPhraseQueryMaker.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleSloppyPhraseQueryMaker.java index 9e18f7966b0..5cd6218f518 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleSloppyPhraseQueryMaker.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SimpleSloppyPhraseQueryMaker.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.feeds; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.feeds; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.feeds; + import java.util.ArrayList; import java.util.StringTokenizer; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SingleDocSource.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SingleDocSource.java index f24db31d6c7..f5c8af4506f 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SingleDocSource.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SingleDocSource.java @@ -1,7 +1,3 @@ -package org.apache.lucene.benchmark.byTask.feeds; - -import java.io.IOException; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,10 @@ import java.io.IOException; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.feeds; + +import java.io.IOException; + /** * Creates the same document each time {@link #getNextDocData(DocData)} is called. diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SortableSingleDocSource.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SortableSingleDocSource.java index ec4ca98badd..8e8f5e105f3 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SortableSingleDocSource.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SortableSingleDocSource.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.feeds; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.feeds; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.feeds; + import java.util.Properties; import java.util.Random; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SpatialDocMaker.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SpatialDocMaker.java index b3491590d9c..b7f04d1da3b 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SpatialDocMaker.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SpatialDocMaker.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.feeds; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.feeds; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.feeds; + import java.util.AbstractMap; import java.util.HashMap; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SpatialFileQueryMaker.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SpatialFileQueryMaker.java index c6d094dac86..c99de3db071 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SpatialFileQueryMaker.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SpatialFileQueryMaker.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.feeds; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.feeds; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.feeds; + import java.util.ArrayList; import java.util.List; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecContentSource.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecContentSource.java index 0790035a928..6ceb9229506 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecContentSource.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecContentSource.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.feeds; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.feeds; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.feeds; + import java.io.BufferedReader; import java.io.IOException; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecDocParser.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecDocParser.java index 163020ea4e6..19d0dd73cec 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecDocParser.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecDocParser.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.feeds; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.feeds; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.feeds; + import java.io.IOException; import java.nio.file.Path; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecFBISParser.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecFBISParser.java index 1b585900566..20ad0c2c242 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecFBISParser.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecFBISParser.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.feeds; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.feeds; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.feeds; + import java.io.IOException; import java.util.Date; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecFR94Parser.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecFR94Parser.java index 771033d8d48..df78b6ae808 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecFR94Parser.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecFR94Parser.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.feeds; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.feeds; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.feeds; + import java.io.IOException; import java.util.Date; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecFTParser.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecFTParser.java index 58a3aa986a4..0dd25b3e366 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecFTParser.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecFTParser.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.feeds; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.feeds; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.feeds; + import java.io.IOException; import java.util.Date; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecGov2Parser.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecGov2Parser.java index 231baca4973..36a6a0f1525 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecGov2Parser.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecGov2Parser.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.feeds; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.feeds; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.feeds; + import java.io.IOException; import java.io.StringReader; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecLATimesParser.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecLATimesParser.java index 7a3ff274ade..4b01dc213df 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecLATimesParser.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecLATimesParser.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.feeds; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.feeds; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.feeds; + import java.io.IOException; import java.util.Date; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecParserByPath.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecParserByPath.java index 6f2e0097350..f2acd0e7f71 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecParserByPath.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/TrecParserByPath.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.feeds; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.feeds; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.feeds; + import java.io.IOException; /** diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/package-info.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/package-info.java index 8df0337404f..17f8830bf10 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/package-info.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Sources for benchmark inputs: documents and queries. */ diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/package-info.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/package-info.java index 465557aba5b..430810bbde9 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/package-info.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Benchmarking Lucene By Tasks *

diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/programmatic/Sample.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/programmatic/Sample.java index aa5b8bb70ca..a9f26e9b46b 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/programmatic/Sample.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/programmatic/Sample.java @@ -1,11 +1,10 @@ -package org.apache.lucene.benchmark.byTask.programmatic; - /* - * Copyright 2005 The Apache Software Foundation - * - * Licensed 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 + * 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 * @@ -15,8 +14,8 @@ package org.apache.lucene.benchmark.byTask.programmatic; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.programmatic; -import java.io.IOException; import java.util.Properties; import org.apache.lucene.benchmark.byTask.PerfRunData; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/programmatic/package-info.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/programmatic/package-info.java index d9dfd44ff9b..ecc741386dd 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/programmatic/package-info.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/programmatic/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Sample performance test written programmatically - no algorithm file is needed here. */ diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/Points.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/Points.java index a12b6fff5f9..fccf489bd60 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/Points.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/Points.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.stats; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.stats; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.stats; + import java.util.ArrayList; import java.util.List; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/Report.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/Report.java index 8f5c6c7f09f..1260c2af9f5 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/Report.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/Report.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.stats; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.stats; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.stats; + /** * Textual report of current statistics. diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/TaskStats.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/TaskStats.java index 05ae92b050c..ab116a90f2f 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/TaskStats.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/TaskStats.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.stats; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.stats; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.stats; + import org.apache.lucene.benchmark.byTask.tasks.PerfTask; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/package-info.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/package-info.java index 2bc0751b405..f32e8476388 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/package-info.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Statistics maintained when running benchmark tasks. */ diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AddDocTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AddDocTask.java index b40c76fde2f..17372827a63 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AddDocTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AddDocTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import java.util.Locale; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AddFacetedDocTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AddFacetedDocTask.java index 5063e0af99d..3182afe6327 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AddFacetedDocTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AddFacetedDocTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import java.util.ArrayList; import java.util.List; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AddIndexesTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AddIndexesTask.java index ddc72f03fc9..8e89c910159 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AddIndexesTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AddIndexesTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import java.nio.file.Paths; import java.util.List; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java index 672ea0d7d52..051a8fc0bd1 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import org.apache.lucene.analysis.util.AbstractAnalysisFactory; import org.apache.lucene.analysis.util.CharFilterFactory; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/BenchmarkHighlighter.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/BenchmarkHighlighter.java index fd229d08964..e00cc384670 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/BenchmarkHighlighter.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/BenchmarkHighlighter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.document.Document; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ClearStatsTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ClearStatsTask.java index ad01fe4d314..4a437e707f6 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ClearStatsTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ClearStatsTask.java @@ -1,7 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - -import org.apache.lucene.benchmark.byTask.PerfRunData; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,10 @@ import org.apache.lucene.benchmark.byTask.PerfRunData; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + +import org.apache.lucene.benchmark.byTask.PerfRunData; + /** * Clear statistics data. diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CloseIndexTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CloseIndexTask.java index 8bd1750ffc7..fce6b7de23c 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CloseIndexTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CloseIndexTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import java.io.IOException; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CloseReaderTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CloseReaderTask.java index 8bac4f4ecaa..759b06bad5e 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CloseReaderTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CloseReaderTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import java.io.IOException; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CloseTaxonomyIndexTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CloseTaxonomyIndexTask.java index 935051f684a..5b7ec0b6921 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CloseTaxonomyIndexTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CloseTaxonomyIndexTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import java.io.IOException; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CloseTaxonomyReaderTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CloseTaxonomyReaderTask.java index bd455fbf3f6..7decc38d457 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CloseTaxonomyReaderTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CloseTaxonomyReaderTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import java.io.IOException; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CommitIndexTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CommitIndexTask.java index d6b2e9ebb01..fda49947c26 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CommitIndexTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CommitIndexTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import java.util.HashMap; import java.util.Map; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CommitTaxonomyIndexTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CommitTaxonomyIndexTask.java index 9a74ea3c6b8..5273c6b7245 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CommitTaxonomyIndexTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CommitTaxonomyIndexTask.java @@ -1,4 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; import org.apache.lucene.benchmark.byTask.PerfRunData; import org.apache.lucene.facet.taxonomy.TaxonomyWriter; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ConsumeContentSourceTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ConsumeContentSourceTask.java index f1395193859..715d1d8f1a0 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ConsumeContentSourceTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ConsumeContentSourceTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import org.apache.lucene.benchmark.byTask.PerfRunData; import org.apache.lucene.benchmark.byTask.feeds.ContentSource; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java index 53587b5ed22..74486d6c38c 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import java.io.BufferedOutputStream; import java.io.IOException; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateTaxonomyIndexTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateTaxonomyIndexTask.java index a2575787beb..12f112c266f 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateTaxonomyIndexTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/CreateTaxonomyIndexTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import org.apache.lucene.benchmark.byTask.PerfRunData; import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ForceMergeTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ForceMergeTask.java index 5f7a9218aa0..40a3637750e 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ForceMergeTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ForceMergeTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import org.apache.lucene.benchmark.byTask.PerfRunData; import org.apache.lucene.index.IndexWriter; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NearRealtimeReaderTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NearRealtimeReaderTask.java index 4affd10c4c0..cbc7db7c137 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NearRealtimeReaderTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NearRealtimeReaderTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import org.apache.lucene.benchmark.byTask.PerfRunData; import org.apache.lucene.index.DirectoryReader; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java index 074fb5a1d0e..b008e70c071 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java @@ -1,10 +1,10 @@ -package org.apache.lucene.benchmark.byTask.tasks; /* - * Copyright 2005 The Apache Software Foundation - * - * Licensed 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 + * 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 * @@ -14,6 +14,7 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.benchmark.byTask.PerfRunData; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewCollationAnalyzerTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewCollationAnalyzerTask.java index aa90c2ec9f0..95cf8b285cd 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewCollationAnalyzerTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewCollationAnalyzerTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import java.lang.reflect.Constructor; import java.lang.reflect.Method; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewLocaleTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewLocaleTask.java index 6cdcadf3c00..4cdcb7c74ba 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewLocaleTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewLocaleTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import java.util.Locale; import java.util.StringTokenizer; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewRoundTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewRoundTask.java index cb619223328..0d53a59eacb 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewRoundTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewRoundTask.java @@ -1,7 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - -import org.apache.lucene.benchmark.byTask.PerfRunData; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,10 @@ import org.apache.lucene.benchmark.byTask.PerfRunData; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + +import org.apache.lucene.benchmark.byTask.PerfRunData; + /** diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OpenIndexTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OpenIndexTask.java index b2f2898914e..97562920033 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OpenIndexTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OpenIndexTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import org.apache.lucene.benchmark.byTask.PerfRunData; import org.apache.lucene.benchmark.byTask.utils.Config; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OpenReaderTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OpenReaderTask.java index 63a7b46ebb9..19cb97bda20 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OpenReaderTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OpenReaderTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import java.io.IOException; import java.util.Collection; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OpenTaxonomyIndexTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OpenTaxonomyIndexTask.java index 1882cac7f08..9af531e211c 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OpenTaxonomyIndexTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OpenTaxonomyIndexTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import org.apache.lucene.benchmark.byTask.PerfRunData; import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OpenTaxonomyReaderTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OpenTaxonomyReaderTask.java index 5e15446f0c6..d68c3050733 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OpenTaxonomyReaderTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/OpenTaxonomyReaderTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import java.io.IOException; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PerfTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PerfTask.java index d7a39ffd01b..bad33981f1e 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PerfTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PerfTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import java.util.Locale; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PrintReaderTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PrintReaderTask.java index 211c603e368..c16401266f8 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PrintReaderTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PrintReaderTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import org.apache.lucene.benchmark.byTask.PerfRunData; import org.apache.lucene.index.DirectoryReader; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java index cf212bb476a..a60859d54b8 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import java.io.IOException; import java.util.Collection; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTokensTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTokensTask.java index 8b49eb0f8b5..4950d418e71 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTokensTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTokensTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import java.io.Reader; import java.util.List; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReopenReaderTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReopenReaderTask.java index 2cd46d6903d..6add27ccb55 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReopenReaderTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReopenReaderTask.java @@ -1,4 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; import java.io.IOException; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepAllTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepAllTask.java index bac4f3dfc66..1e5069a559f 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepAllTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepAllTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import java.util.List; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSelectByPrefTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSelectByPrefTask.java index 64ab949ce5b..779f273de34 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSelectByPrefTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSelectByPrefTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import java.util.List; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByNameRoundTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByNameRoundTask.java index 731e3ef308e..129e17ec1a4 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByNameRoundTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByNameRoundTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import java.util.LinkedHashMap; import java.util.List; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByNameTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByNameTask.java index 2da03ec5051..151419ab765 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByNameTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByNameTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import java.util.LinkedHashMap; import java.util.List; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByPrefRoundTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByPrefRoundTask.java index 7cebb1ecaec..c5b2a4d7e2f 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByPrefRoundTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByPrefRoundTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import java.util.LinkedHashMap; import java.util.List; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByPrefTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByPrefTask.java index 241f252b2b9..b4ab6ae3a0b 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByPrefTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSumByPrefTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import org.apache.lucene.benchmark.byTask.PerfRunData; import org.apache.lucene.benchmark.byTask.stats.Report; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReportTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReportTask.java index 6cbc5e6f634..844fbce1103 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReportTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReportTask.java @@ -1,12 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - -import java.util.LinkedHashMap; - -import org.apache.lucene.benchmark.byTask.PerfRunData; -import org.apache.lucene.benchmark.byTask.stats.Report; -import org.apache.lucene.benchmark.byTask.stats.TaskStats; -import org.apache.lucene.benchmark.byTask.utils.Format; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -23,6 +14,15 @@ import org.apache.lucene.benchmark.byTask.utils.Format; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + +import java.util.LinkedHashMap; + +import org.apache.lucene.benchmark.byTask.PerfRunData; +import org.apache.lucene.benchmark.byTask.stats.Report; +import org.apache.lucene.benchmark.byTask.stats.TaskStats; +import org.apache.lucene.benchmark.byTask.utils.Format; + /** * Report (abstract) task - all report tasks extend this task. diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ResetInputsTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ResetInputsTask.java index 2134f895016..3029c780bb5 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ResetInputsTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ResetInputsTask.java @@ -1,7 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - -import org.apache.lucene.benchmark.byTask.PerfRunData; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,10 @@ import org.apache.lucene.benchmark.byTask.PerfRunData; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + +import org.apache.lucene.benchmark.byTask.PerfRunData; + diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ResetSystemEraseTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ResetSystemEraseTask.java index 04c49444716..9cd72ea9a2b 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ResetSystemEraseTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ResetSystemEraseTask.java @@ -1,7 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - -import org.apache.lucene.benchmark.byTask.PerfRunData; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,10 @@ import org.apache.lucene.benchmark.byTask.PerfRunData; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + +import org.apache.lucene.benchmark.byTask.PerfRunData; + diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ResetSystemSoftTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ResetSystemSoftTask.java index d10b7c6ad92..3978fc0bca9 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ResetSystemSoftTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ResetSystemSoftTask.java @@ -1,7 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - -import org.apache.lucene.benchmark.byTask.PerfRunData; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,10 @@ import org.apache.lucene.benchmark.byTask.PerfRunData; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + +import org.apache.lucene.benchmark.byTask.PerfRunData; + diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RollbackIndexTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RollbackIndexTask.java index d44f88ecd69..53a1ac562e3 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RollbackIndexTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RollbackIndexTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import java.io.IOException; import java.io.PrintStream; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTask.java index ff4cd768cb6..278e639d270 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import org.apache.lucene.benchmark.byTask.PerfRunData; import org.apache.lucene.benchmark.byTask.feeds.QueryMaker; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetHighlightTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetHighlightTask.java index 4832d81461c..f017177d74b 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetHighlightTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetHighlightTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import java.util.Collection; import java.util.Collections; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetLoadFieldSelectorTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetLoadFieldSelectorTask.java index 68a82d09e52..ada3f715434 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetLoadFieldSelectorTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetLoadFieldSelectorTask.java @@ -1,10 +1,10 @@ -package org.apache.lucene.benchmark.byTask.tasks; /* - * Copyright 2005 The Apache Software Foundation - * - * Licensed 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 + * 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 * @@ -14,7 +14,7 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.benchmark.byTask.tasks; import java.io.IOException; import java.util.HashSet; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetTask.java index 778949bde1f..97ae73873f5 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import org.apache.lucene.benchmark.byTask.PerfRunData; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetVectorHighlightTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetVectorHighlightTask.java index d70a3c9d7a3..15a13ca3624 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetVectorHighlightTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetVectorHighlightTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.benchmark.byTask.PerfRunData; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravTask.java index 535e9467499..f96efbd15d7 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import org.apache.lucene.benchmark.byTask.PerfRunData; import org.apache.lucene.benchmark.byTask.feeds.QueryMaker; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchWithCollectorTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchWithCollectorTask.java index 3278163ccd1..0826c862dc7 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchWithCollectorTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchWithCollectorTask.java @@ -1,4 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; import org.apache.lucene.benchmark.byTask.PerfRunData; import org.apache.lucene.benchmark.byTask.feeds.QueryMaker; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchWithSortTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchWithSortTask.java index 91fc485ceab..8361ab365f0 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchWithSortTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchWithSortTask.java @@ -1,4 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; import java.util.Locale; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SetPropTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SetPropTask.java index 06834617bd6..acf52c74cd6 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SetPropTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SetPropTask.java @@ -1,7 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - -import org.apache.lucene.benchmark.byTask.PerfRunData; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,10 @@ import org.apache.lucene.benchmark.byTask.PerfRunData; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + +import org.apache.lucene.benchmark.byTask.PerfRunData; + /** * Set a performance test configuration property. diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/TaskSequence.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/TaskSequence.java index 9ee2ab11180..c57845da621 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/TaskSequence.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/TaskSequence.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import java.util.ArrayList; import java.util.List; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/UpdateDocTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/UpdateDocTask.java index 0ff3ff29ab2..88b5f60cb67 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/UpdateDocTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/UpdateDocTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import org.apache.lucene.benchmark.byTask.PerfRunData; import org.apache.lucene.benchmark.byTask.feeds.DocMaker; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WaitTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WaitTask.java index 4fa47d5b776..c741954c20a 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WaitTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WaitTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import org.apache.lucene.benchmark.byTask.PerfRunData; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WarmTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WarmTask.java index 64c3f50f3ea..07bbc5ce552 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WarmTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WarmTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import org.apache.lucene.benchmark.byTask.PerfRunData; import org.apache.lucene.benchmark.byTask.feeds.QueryMaker; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteEnwikiLineDocTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteEnwikiLineDocTask.java index 4a46e0428bf..01b549e1264 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteEnwikiLineDocTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteEnwikiLineDocTask.java @@ -1,3 +1,19 @@ +/* + * 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.benchmark.byTask.tasks; import java.io.BufferedWriter; @@ -15,22 +31,6 @@ import org.apache.lucene.benchmark.byTask.utils.StreamUtils; import org.apache.lucene.document.Document; import org.apache.lucene.index.IndexableField; -/* - * 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 {@link WriteLineDocTask} which for Wikipedia input, will write category pages diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTask.java index afaca5e3625..3bf96951491 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTask.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import java.io.BufferedWriter; import java.io.OutputStream; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/package-info.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/package-info.java index d06f4848a72..c7446cbde51 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/package-info.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Extendable benchmark tasks. */ diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Algorithm.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Algorithm.java index d6cd82abf6a..821db389564 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Algorithm.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Algorithm.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.utils; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.utils; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.utils; + import java.io.StreamTokenizer; import java.io.StringReader; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/AnalyzerFactory.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/AnalyzerFactory.java index 149f6e66e96..c91f87328a1 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/AnalyzerFactory.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/AnalyzerFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.utils; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.utils; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.utils; + import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.TokenStream; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Config.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Config.java index b6841586055..b7afcf20d3f 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Config.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Config.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.utils; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.utils; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.utils; + import java.io.BufferedReader; import java.io.IOException; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Format.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Format.java index e023df005e6..a4636de5590 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Format.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Format.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.utils; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.utils; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.utils; + import java.text.NumberFormat; import java.util.Locale; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/StreamUtils.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/StreamUtils.java index 2f9fb31bd7d..f51680d3443 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/StreamUtils.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/StreamUtils.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.utils; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.utils; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.utils; + import java.io.BufferedInputStream; import java.io.BufferedOutputStream; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/package-info.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/package-info.java index 4066a7a98af..57d188cbad4 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/package-info.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Utilities used for the benchmark, and for the reports. */ diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/package-info.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/package-info.java index 2df570b12ad..ec90d751475 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/package-info.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Lucene Benchmarking Package *

diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/package-info.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/package-info.java index de19b3c5bec..df1428bd31f 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/package-info.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Search Quality Benchmarking. *

diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/QueryDriver.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/QueryDriver.java index 4be533463df..1240d4777e4 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/QueryDriver.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/QueryDriver.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.quality.trec; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.quality.trec; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.quality.trec; + import org.apache.lucene.benchmark.quality.utils.SimpleQQParser; import org.apache.lucene.benchmark.quality.utils.SubmissionReport; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/package-info.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/package-info.java index 45ddec80a5c..052290aa32d 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/package-info.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Utilities for Trec related quality benchmarking, feeding from Trec Topics and QRels inputs. */ diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/package-info.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/package-info.java index 56d721d4dca..1aa19b9f5b0 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/package-info.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Miscellaneous utilities for search quality benchmarking: query parsing, submission reports. */ diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractReuters.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractReuters.java index 1079bceeac9..4e90d372fe2 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractReuters.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractReuters.java @@ -1,10 +1,10 @@ -package org.apache.lucene.benchmark.utils; /* - * Copyright 2005 The Apache Software Foundation - * - * Licensed 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 + * 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 * @@ -14,7 +14,7 @@ package org.apache.lucene.benchmark.utils; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.benchmark.utils; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -30,7 +30,6 @@ import java.util.regex.Pattern; import org.apache.lucene.util.IOUtils; - /** * Split the Reuters SGML documents into Simple Text files containing: Title, Date, Dateline, Body */ diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractWikipedia.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractWikipedia.java index e85656a0357..9c76b922833 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractWikipedia.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractWikipedia.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.utils; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.utils; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.utils; + import java.io.IOException; import java.io.Writer; diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/utils/package-info.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/utils/package-info.java index 956b84fa927..287e206057c 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/utils/package-info.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/utils/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Benchmark Utility functions. */ diff --git a/lucene/benchmark/src/test/conf/ConfLoader.java b/lucene/benchmark/src/test/conf/ConfLoader.java index 3d0341411be..97c02ac5a59 100644 --- a/lucene/benchmark/src/test/conf/ConfLoader.java +++ b/lucene/benchmark/src/test/conf/ConfLoader.java @@ -1,5 +1,3 @@ -package conf; - /* * 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 conf; * See the License for the specific language governing permissions and * limitations under the License. */ +package conf; public class ConfLoader { // don't mind me, I load .alg files diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/BenchmarkTestCase.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/BenchmarkTestCase.java index 65b4a762600..2092afedc06 100644 --- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/BenchmarkTestCase.java +++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/BenchmarkTestCase.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark; + import java.io.IOException; import java.io.InputStream; diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java index 0c82cb55b55..a9399520793 100644 --- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java +++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.benchmark.byTask; import java.io.BufferedReader; diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksParse.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksParse.java index 2b15e99f67b..90158dae68f 100644 --- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksParse.java +++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksParse.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.benchmark.byTask; import java.io.IOException; diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/DocMakerTest.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/DocMakerTest.java index 0d7292e39ee..c2ead39e4b8 100644 --- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/DocMakerTest.java +++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/DocMakerTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.feeds; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.feeds; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.feeds; + import java.io.PrintStream; import java.nio.file.Files; diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSourceTest.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSourceTest.java index b66b8e0d91f..c6fa60fe78a 100644 --- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSourceTest.java +++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSourceTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.feeds; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.feeds; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.feeds; + import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/LineDocSourceTest.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/LineDocSourceTest.java index cce2f68b4c9..99236cd27a7 100644 --- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/LineDocSourceTest.java +++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/LineDocSourceTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.feeds; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.feeds; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.feeds; + import java.io.BufferedWriter; import java.io.IOException; diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TestHtmlParser.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TestHtmlParser.java index ec4c96e4cb3..a838334ee59 100644 --- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TestHtmlParser.java +++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TestHtmlParser.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.feeds; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.feeds; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.feeds; + import java.io.StringReader; import java.util.Locale; diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TrecContentSourceTest.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TrecContentSourceTest.java index 3d2322db4e6..bb87fdd9e3e 100644 --- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TrecContentSourceTest.java +++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/TrecContentSourceTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.feeds; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.feeds; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.feeds; + import java.io.BufferedReader; import java.io.IOException; diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/AddIndexesTaskTest.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/AddIndexesTaskTest.java index e86cf6d2757..1f38264aec7 100644 --- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/AddIndexesTaskTest.java +++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/AddIndexesTaskTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import java.nio.file.Path; import java.util.Properties; diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CommitIndexTaskTest.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CommitIndexTaskTest.java index 57846d434c0..f6e7faa43d9 100644 --- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CommitIndexTaskTest.java +++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CommitIndexTaskTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import java.util.Properties; diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CountingHighlighterTestTask.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CountingHighlighterTestTask.java index 68bbf8b28f3..da322dfc377 100644 --- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CountingHighlighterTestTask.java +++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CountingHighlighterTestTask.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.benchmark.byTask.tasks; import java.io.IOException; diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CountingSearchTestTask.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CountingSearchTestTask.java index 1f002c0a20f..318c8f504b5 100644 --- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CountingSearchTestTask.java +++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CountingSearchTestTask.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.benchmark.byTask.tasks; import org.apache.lucene.benchmark.byTask.PerfRunData; diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTaskTest.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTaskTest.java index fc4230e9373..90ae88ebf5b 100644 --- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTaskTest.java +++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTaskTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import java.io.ByteArrayOutputStream; import java.io.PrintStream; diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/PerfTaskTest.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/PerfTaskTest.java index d6debaac72c..09bda2245d6 100644 --- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/PerfTaskTest.java +++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/PerfTaskTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import java.util.Properties; diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/SearchWithSortTaskTest.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/SearchWithSortTaskTest.java index c16e546bcf1..a85196fb91c 100644 --- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/SearchWithSortTaskTest.java +++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/SearchWithSortTaskTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import org.apache.lucene.benchmark.BenchmarkTestCase; import org.apache.lucene.benchmark.byTask.PerfRunData; diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteEnwikiLineDocTaskTest.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteEnwikiLineDocTaskTest.java index ac8277c919a..d2bcd08349e 100644 --- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteEnwikiLineDocTaskTest.java +++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteEnwikiLineDocTaskTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import java.io.BufferedReader; import java.io.File; diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTaskTest.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTaskTest.java index 6a5292a02f1..3b2d6259469 100644 --- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTaskTest.java +++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTaskTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks; + import java.io.BufferedReader; import java.io.InputStream; diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/alt/AltPackageTaskTest.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/alt/AltPackageTaskTest.java index 77f84b8fd15..059650d1050 100644 --- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/alt/AltPackageTaskTest.java +++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/alt/AltPackageTaskTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks.alt; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks.alt; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks.alt; + import org.apache.lucene.benchmark.BenchmarkTestCase; import org.apache.lucene.benchmark.byTask.Benchmark; diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/alt/AltTestTask.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/alt/AltTestTask.java index b01c3bd652b..5de45ef318e 100644 --- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/alt/AltTestTask.java +++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/alt/AltTestTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.tasks.alt; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.tasks.alt; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.tasks.alt; + import org.apache.lucene.benchmark.byTask.PerfRunData; import org.apache.lucene.benchmark.byTask.tasks.PerfTask; diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/utils/StreamUtilsTest.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/utils/StreamUtilsTest.java index df6bea19407..072f88b12d1 100644 --- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/utils/StreamUtilsTest.java +++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/utils/StreamUtilsTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.utils; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.utils; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.utils; + import java.io.BufferedReader; import java.io.BufferedWriter; diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/utils/TestConfig.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/utils/TestConfig.java index c975bbca059..1c34daab9b7 100644 --- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/utils/TestConfig.java +++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/utils/TestConfig.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.byTask.utils; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.byTask.utils; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.byTask.utils; + import java.util.Properties; diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/quality/TestQualityRun.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/quality/TestQualityRun.java index b3eb8e9059c..494fe6deabc 100644 --- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/quality/TestQualityRun.java +++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/quality/TestQualityRun.java @@ -1,5 +1,3 @@ -package org.apache.lucene.benchmark.quality; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.benchmark.quality; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.benchmark.quality; + import org.apache.lucene.benchmark.BenchmarkTestCase; import org.apache.lucene.benchmark.quality.trec.TrecJudge; diff --git a/lucene/classification/src/java/org/apache/lucene/classification/CachingNaiveBayesClassifier.java b/lucene/classification/src/java/org/apache/lucene/classification/CachingNaiveBayesClassifier.java index f0d909f8d14..ec56a919fa1 100644 --- a/lucene/classification/src/java/org/apache/lucene/classification/CachingNaiveBayesClassifier.java +++ b/lucene/classification/src/java/org/apache/lucene/classification/CachingNaiveBayesClassifier.java @@ -1,3 +1,19 @@ +/* + * 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.classification; import java.io.IOException; @@ -20,22 +36,6 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.TotalHitCountCollector; import org.apache.lucene.util.BytesRef; -/* - * 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. - */ /** diff --git a/lucene/classification/src/java/org/apache/lucene/classification/document/DocumentClassifier.java b/lucene/classification/src/java/org/apache/lucene/classification/document/DocumentClassifier.java index e5bb6e649e3..b53a9dbc1c5 100644 --- a/lucene/classification/src/java/org/apache/lucene/classification/document/DocumentClassifier.java +++ b/lucene/classification/src/java/org/apache/lucene/classification/document/DocumentClassifier.java @@ -1,5 +1,3 @@ -package org.apache.lucene.classification.document; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.classification.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.classification.document; + import java.io.IOException; import java.util.List; diff --git a/lucene/classification/src/java/org/apache/lucene/classification/document/KNearestNeighborDocumentClassifier.java b/lucene/classification/src/java/org/apache/lucene/classification/document/KNearestNeighborDocumentClassifier.java index fb26d158588..c0d709a415d 100644 --- a/lucene/classification/src/java/org/apache/lucene/classification/document/KNearestNeighborDocumentClassifier.java +++ b/lucene/classification/src/java/org/apache/lucene/classification/document/KNearestNeighborDocumentClassifier.java @@ -1,5 +1,3 @@ -package org.apache.lucene.classification.document; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.classification.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.classification.document; + import java.io.IOException; import java.io.StringReader; diff --git a/lucene/classification/src/java/org/apache/lucene/classification/document/SimpleNaiveBayesDocumentClassifier.java b/lucene/classification/src/java/org/apache/lucene/classification/document/SimpleNaiveBayesDocumentClassifier.java index 785518bf537..3dc01bb49b2 100644 --- a/lucene/classification/src/java/org/apache/lucene/classification/document/SimpleNaiveBayesDocumentClassifier.java +++ b/lucene/classification/src/java/org/apache/lucene/classification/document/SimpleNaiveBayesDocumentClassifier.java @@ -1,5 +1,3 @@ -package org.apache.lucene.classification.document; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.classification.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.classification.document; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/classification/src/java/org/apache/lucene/classification/document/package-info.java b/lucene/classification/src/java/org/apache/lucene/classification/document/package-info.java index 34ea098ac3e..69d9c30b971 100644 --- a/lucene/classification/src/java/org/apache/lucene/classification/document/package-info.java +++ b/lucene/classification/src/java/org/apache/lucene/classification/document/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Uses already seen data (the indexed documents) to classify new documents. * diff --git a/lucene/classification/src/java/org/apache/lucene/classification/package-info.java b/lucene/classification/src/java/org/apache/lucene/classification/package-info.java index abb3acffbdf..fa05f5af43a 100644 --- a/lucene/classification/src/java/org/apache/lucene/classification/package-info.java +++ b/lucene/classification/src/java/org/apache/lucene/classification/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Uses already seen data (the indexed documents) to classify an input ( can be simple text or a structured document). * diff --git a/lucene/classification/src/java/org/apache/lucene/classification/utils/ConfusionMatrixGenerator.java b/lucene/classification/src/java/org/apache/lucene/classification/utils/ConfusionMatrixGenerator.java index 5b2bc8240f4..17f5b21afc6 100644 --- a/lucene/classification/src/java/org/apache/lucene/classification/utils/ConfusionMatrixGenerator.java +++ b/lucene/classification/src/java/org/apache/lucene/classification/utils/ConfusionMatrixGenerator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.classification.utils; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.classification.utils; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.classification.utils; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/classification/src/java/org/apache/lucene/classification/utils/DatasetSplitter.java b/lucene/classification/src/java/org/apache/lucene/classification/utils/DatasetSplitter.java index c1e6ed356fb..0b03b94f56d 100644 --- a/lucene/classification/src/java/org/apache/lucene/classification/utils/DatasetSplitter.java +++ b/lucene/classification/src/java/org/apache/lucene/classification/utils/DatasetSplitter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.classification.utils; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.classification.utils; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.classification.utils; + import java.io.IOException; diff --git a/lucene/classification/src/java/org/apache/lucene/classification/utils/package-info.java b/lucene/classification/src/java/org/apache/lucene/classification/utils/package-info.java index d510e093c2c..857276750b7 100644 --- a/lucene/classification/src/java/org/apache/lucene/classification/utils/package-info.java +++ b/lucene/classification/src/java/org/apache/lucene/classification/utils/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Utilities for evaluation, data preparation, etc. */ diff --git a/lucene/classification/src/test/org/apache/lucene/classification/CachingNaiveBayesClassifierTest.java b/lucene/classification/src/test/org/apache/lucene/classification/CachingNaiveBayesClassifierTest.java index b1332919bfd..535c96f222e 100644 --- a/lucene/classification/src/test/org/apache/lucene/classification/CachingNaiveBayesClassifierTest.java +++ b/lucene/classification/src/test/org/apache/lucene/classification/CachingNaiveBayesClassifierTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.classification; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.classification; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.classification; + import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.MockAnalyzer; diff --git a/lucene/classification/src/test/org/apache/lucene/classification/document/DocumentClassificationTestBase.java b/lucene/classification/src/test/org/apache/lucene/classification/document/DocumentClassificationTestBase.java index 766ed24691b..316802b0eee 100644 --- a/lucene/classification/src/test/org/apache/lucene/classification/document/DocumentClassificationTestBase.java +++ b/lucene/classification/src/test/org/apache/lucene/classification/document/DocumentClassificationTestBase.java @@ -1,5 +1,3 @@ -package org.apache.lucene.classification.document; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.classification.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.classification.document; + import java.io.IOException; import java.util.LinkedHashMap; diff --git a/lucene/classification/src/test/org/apache/lucene/classification/document/KNearestNeighborDocumentClassifierTest.java b/lucene/classification/src/test/org/apache/lucene/classification/document/KNearestNeighborDocumentClassifierTest.java index 10e4dce19e1..74152f6a45c 100644 --- a/lucene/classification/src/test/org/apache/lucene/classification/document/KNearestNeighborDocumentClassifierTest.java +++ b/lucene/classification/src/test/org/apache/lucene/classification/document/KNearestNeighborDocumentClassifierTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.classification.document; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.classification.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.classification.document; + import org.apache.lucene.document.Document; import org.apache.lucene.index.Term; diff --git a/lucene/classification/src/test/org/apache/lucene/classification/document/SimpleNaiveBayesDocumentClassifierTest.java b/lucene/classification/src/test/org/apache/lucene/classification/document/SimpleNaiveBayesDocumentClassifierTest.java index a1bcb54bf56..7f6630c212c 100644 --- a/lucene/classification/src/test/org/apache/lucene/classification/document/SimpleNaiveBayesDocumentClassifierTest.java +++ b/lucene/classification/src/test/org/apache/lucene/classification/document/SimpleNaiveBayesDocumentClassifierTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.classification.document; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.classification.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.classification.document; + import org.apache.lucene.util.BytesRef; import org.junit.Test; diff --git a/lucene/classification/src/test/org/apache/lucene/classification/utils/ConfusionMatrixGeneratorTest.java b/lucene/classification/src/test/org/apache/lucene/classification/utils/ConfusionMatrixGeneratorTest.java index 037b0c728fd..e582b79d615 100644 --- a/lucene/classification/src/test/org/apache/lucene/classification/utils/ConfusionMatrixGeneratorTest.java +++ b/lucene/classification/src/test/org/apache/lucene/classification/utils/ConfusionMatrixGeneratorTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.classification.utils; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.classification.utils; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.classification.utils; + import java.io.IOException; import java.util.List; diff --git a/lucene/classification/src/test/org/apache/lucene/classification/utils/DataSplitterTest.java b/lucene/classification/src/test/org/apache/lucene/classification/utils/DataSplitterTest.java index 9b64c848e22..d69fefba1e8 100644 --- a/lucene/classification/src/test/org/apache/lucene/classification/utils/DataSplitterTest.java +++ b/lucene/classification/src/test/org/apache/lucene/classification/utils/DataSplitterTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.classification.utils; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.classification.utils; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.classification.utils; + import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.MockAnalyzer; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/autoprefix/AutoPrefixPostingsFormat.java b/lucene/codecs/src/java/org/apache/lucene/codecs/autoprefix/AutoPrefixPostingsFormat.java index 62b5ed9834e..b83866a8175 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/autoprefix/AutoPrefixPostingsFormat.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/autoprefix/AutoPrefixPostingsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.autoprefix; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.autoprefix; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.autoprefix; + import java.io.IOException; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/autoprefix/package-info.java b/lucene/codecs/src/java/org/apache/lucene/codecs/autoprefix/package-info.java index b15f2fad7b2..90758b0a3e8 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/autoprefix/package-info.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/autoprefix/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * An experimental postings format that automatically indexes appropriate * prefix terms for fast range and prefix queries. diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java b/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java index 354957a92e2..6c9ddd2bd72 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.blockterms; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.blockterms; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.blockterms; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsWriter.java b/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsWriter.java index c9382b64bc8..f19cd2c052a 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsWriter.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsWriter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.blockterms; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.blockterms; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.blockterms; + import java.io.Closeable; import java.io.IOException; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexReader.java b/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexReader.java index c153a70410c..adf8191adc7 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexReader.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.blockterms; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.blockterms; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.blockterms; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexWriter.java b/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexWriter.java index 01625762a54..cdfd962ed99 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexWriter.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/FixedGapTermsIndexWriter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.blockterms; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.blockterms; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.blockterms; + import org.apache.lucene.store.IndexOutput; import org.apache.lucene.store.RAMOutputStream; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/TermsIndexReaderBase.java b/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/TermsIndexReaderBase.java index 42698dd9eb5..76ddbd67fdb 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/TermsIndexReaderBase.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/TermsIndexReaderBase.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.blockterms; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.blockterms; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.blockterms; + import java.io.Closeable; import java.io.IOException; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/TermsIndexWriterBase.java b/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/TermsIndexWriterBase.java index d003ca497c0..53ee86d497b 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/TermsIndexWriterBase.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/TermsIndexWriterBase.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.blockterms; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.blockterms; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.blockterms; + import org.apache.lucene.codecs.TermStats; import org.apache.lucene.index.FieldInfo; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexReader.java b/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexReader.java index a916f5b55a2..f3d373ebc79 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexReader.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.blockterms; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.blockterms; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.blockterms; + import java.io.IOException; import java.util.Collection; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexWriter.java b/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexWriter.java index ec12623e42c..47c6e7610ea 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexWriter.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexWriter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.blockterms; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.blockterms; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.blockterms; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/package-info.java b/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/package-info.java index 3317f0a09e9..67368a11010 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/package-info.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Pluggable term index / block terms dictionary implementations. */ diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/BlockTreeOrdsPostingsFormat.java b/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/BlockTreeOrdsPostingsFormat.java index b149a146921..a93622cddcb 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/BlockTreeOrdsPostingsFormat.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/BlockTreeOrdsPostingsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.blocktreeords; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.blocktreeords; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.blocktreeords; + import java.io.IOException; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/FSTOrdsOutputs.java b/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/FSTOrdsOutputs.java index 6c5778a8291..050ad2fc60e 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/FSTOrdsOutputs.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/FSTOrdsOutputs.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.blocktreeords; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.blocktreeords; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.blocktreeords; + import java.io.IOException; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsBlockTreeTermsReader.java b/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsBlockTreeTermsReader.java index 00c22148c66..afdaf5aad17 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsBlockTreeTermsReader.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsBlockTreeTermsReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.blocktreeords; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.blocktreeords; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.blocktreeords; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsBlockTreeTermsWriter.java b/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsBlockTreeTermsWriter.java index 5d45fb06699..fb682fd3ed6 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsBlockTreeTermsWriter.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsBlockTreeTermsWriter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.blocktreeords; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.blocktreeords; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.blocktreeords; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsFieldReader.java b/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsFieldReader.java index 4ce35a3367a..5d02258837d 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsFieldReader.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsFieldReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.blocktreeords; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.blocktreeords; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.blocktreeords; + import java.io.IOException; import java.util.Collection; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsIntersectTermsEnum.java b/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsIntersectTermsEnum.java index e5508e8215e..cd0e246cf27 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsIntersectTermsEnum.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsIntersectTermsEnum.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.blocktreeords; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.blocktreeords; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.blocktreeords; + import java.io.IOException; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsIntersectTermsEnumFrame.java b/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsIntersectTermsEnumFrame.java index c74691c21e5..9312ff9ed3a 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsIntersectTermsEnumFrame.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsIntersectTermsEnumFrame.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.blocktreeords; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.blocktreeords; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.blocktreeords; + import java.io.IOException; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsSegmentTermsEnum.java b/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsSegmentTermsEnum.java index b3615905a3a..92ca1766d5f 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsSegmentTermsEnum.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsSegmentTermsEnum.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.blocktreeords; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.blocktreeords; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.blocktreeords; + //import java.io.*; //import java.nio.charset.StandardCharsets; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsSegmentTermsEnumFrame.java b/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsSegmentTermsEnumFrame.java index bef57cc871a..76a30c4c11e 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsSegmentTermsEnumFrame.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsSegmentTermsEnumFrame.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.blocktreeords; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.blocktreeords; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.blocktreeords; + import java.io.IOException; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/package-info.java b/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/package-info.java index 57f7e38649c..e3cd1b5df5e 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/package-info.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Same postings format as Lucene50, except the terms dictionary also * supports ords, i.e. returning which ord the enum is seeked to, and diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilterFactory.java b/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilterFactory.java index 672d1482f91..6ea660042ac 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilterFactory.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilterFactory.java @@ -1,4 +1,3 @@ -package org.apache.lucene.codecs.bloom; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.codecs.bloom; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.bloom; import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.SegmentWriteState; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java b/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java index 51cff8d1781..6b838bba323 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.bloom; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.bloom; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.bloom; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/DefaultBloomFilterFactory.java b/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/DefaultBloomFilterFactory.java index 3373eec1ef4..95dec8e26e0 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/DefaultBloomFilterFactory.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/DefaultBloomFilterFactory.java @@ -1,4 +1,3 @@ -package org.apache.lucene.codecs.bloom; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.codecs.bloom; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.bloom; import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.SegmentWriteState; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/FuzzySet.java b/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/FuzzySet.java index c1e4ccc7f57..0639e80323e 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/FuzzySet.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/FuzzySet.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.bloom; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.bloom; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.bloom; + import java.io.IOException; import org.apache.lucene.search.DocIdSetIterator; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/HashFunction.java b/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/HashFunction.java index dbf70803b65..d77df2ce042 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/HashFunction.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/HashFunction.java @@ -1,4 +1,3 @@ -package org.apache.lucene.codecs.bloom; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.codecs.bloom; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.bloom; import org.apache.lucene.util.BytesRef; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/MurmurHash2.java b/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/MurmurHash2.java index b43869b2704..e071fe90abe 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/MurmurHash2.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/MurmurHash2.java @@ -1,4 +1,3 @@ -package org.apache.lucene.codecs.bloom; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.codecs.bloom; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.bloom; import org.apache.lucene.util.BytesRef; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/package-info.java b/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/package-info.java index 9080ae664e7..c1f5084d3f8 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/package-info.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Codec PostingsFormat for fast access to low-frequency terms * such as primary key fields. diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesConsumer.java b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesConsumer.java index 65002ae9b30..42607457001 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesConsumer.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesConsumer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.memory; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.memory; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.memory; + import java.io.IOException; import java.util.Iterator; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesFormat.java b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesFormat.java index bda5e4fd40d..358694fc50a 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesFormat.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.memory; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.memory; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.memory; + import java.io.IOException; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesProducer.java b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesProducer.java index 090f0b7ca20..1dfd2f260d6 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesProducer.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesProducer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.memory; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.memory; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.memory; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java index 4755a5eaa95..a1fa24d8ac4 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.memory; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.memory; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.memory; + import java.io.IOException; import java.util.Collection; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdPostingsFormat.java b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdPostingsFormat.java index 98a293bbbd8..e19a4706820 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdPostingsFormat.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdPostingsFormat.java @@ -1,6 +1,3 @@ -package org.apache.lucene.codecs.memory; - - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +14,9 @@ package org.apache.lucene.codecs.memory; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.memory; + + import java.io.IOException; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsReader.java b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsReader.java index 4f0d1e23b56..dd45f766fcf 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsReader.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.memory; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.memory; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.memory; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsWriter.java b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsWriter.java index eff815a948b..cbe6583e892 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsWriter.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsWriter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.memory; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.memory; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.memory; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTPostingsFormat.java b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTPostingsFormat.java index f25f3337940..006554dff2a 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTPostingsFormat.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTPostingsFormat.java @@ -1,6 +1,3 @@ -package org.apache.lucene.codecs.memory; - - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +14,9 @@ package org.apache.lucene.codecs.memory; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.memory; + + import java.io.IOException; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermOutputs.java b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermOutputs.java index 67cb860c8cd..3695fe872e5 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermOutputs.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermOutputs.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.memory; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.memory; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.memory; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsReader.java b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsReader.java index 95ff20f9d6e..0bc43269956 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsReader.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.memory; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.memory; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.memory; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsWriter.java b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsWriter.java index c65867a9c57..50044f1c1ee 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsWriter.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsWriter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.memory; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.memory; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.memory; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesConsumer.java b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesConsumer.java index 2da0e479dc7..44ffdf985cb 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesConsumer.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesConsumer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.memory; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.memory; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.memory; + import java.io.IOException; import java.util.HashMap; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesFormat.java b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesFormat.java index 2f6216db08b..4624ec01b05 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesFormat.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.memory; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.memory; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.memory; + import java.io.IOException; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesProducer.java b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesProducer.java index f0f776da81a..46cf3e511bb 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesProducer.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesProducer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.memory; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.memory; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.memory; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java index be0fab27f05..0fb320c5c21 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.memory; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.memory; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.memory; + import java.io.IOException; import java.util.Collection; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/package-info.java b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/package-info.java index fadc94a391d..d03f8767f3f 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/package-info.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Term dictionary, DocValues or Postings formats that are read * entirely into memory. diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextBKDReader.java b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextBKDReader.java index f07c4a3afaf..d0ab81e5626 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextBKDReader.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextBKDReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.simpletext; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.simpletext; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.simpletext; + import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextCodec.java b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextCodec.java index 89cd859b6d9..4cec13dc8b8 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextCodec.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextCodec.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.simpletext; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.simpletext; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.simpletext; + import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.CompoundFormat; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextCompoundFormat.java b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextCompoundFormat.java index c994df77247..4f9cfbffece 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextCompoundFormat.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextCompoundFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.simpletext; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.simpletext; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.simpletext; + import java.io.FileNotFoundException; import java.io.IOException; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesFormat.java b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesFormat.java index ae14c68d7b7..46ac9839fa6 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesFormat.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.simpletext; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.simpletext; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.simpletext; + import java.io.IOException; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesReader.java b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesReader.java index 72600e494d9..8b97128b805 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesReader.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.simpletext; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.simpletext; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.simpletext; + import java.io.IOException; import java.math.BigDecimal; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesWriter.java b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesWriter.java index 71a9ab213e0..0d284792437 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesWriter.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesWriter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.simpletext; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.simpletext; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.simpletext; + import java.io.IOException; import java.math.BigInteger; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldInfosFormat.java b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldInfosFormat.java index 109966a9673..0ace1534d4e 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldInfosFormat.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldInfosFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.simpletext; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.simpletext; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.simpletext; + import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java index 20a0b8b7c63..2a61854393a 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.simpletext; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.simpletext; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.simpletext; + import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsWriter.java b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsWriter.java index 476d1021857..3b026bedacd 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsWriter.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsWriter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.simpletext; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.simpletext; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.simpletext; + import java.io.IOException; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextLiveDocsFormat.java b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextLiveDocsFormat.java index 5a8a34c4714..22f7687fcd2 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextLiveDocsFormat.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextLiveDocsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.simpletext; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.simpletext; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.simpletext; + import java.io.IOException; import java.util.BitSet; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java index 28443c17828..53e9b87a928 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.simpletext; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.simpletext; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.simpletext; + import java.io.IOException; import java.util.Collection; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextPointFormat.java b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextPointFormat.java index 089ba4f6f5a..87b83104db9 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextPointFormat.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextPointFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.simpletext; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.simpletext; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.simpletext; + import java.io.IOException; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextPointReader.java b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextPointReader.java index ce7fee77a8f..0ec2e0350c0 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextPointReader.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextPointReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.simpletext; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.simpletext; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.simpletext; + import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextPointWriter.java b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextPointWriter.java index 7f92ae8b8bb..0c5a3fc33c9 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextPointWriter.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextPointWriter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.simpletext; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.simpletext; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.simpletext; + import java.io.IOException; import java.util.HashMap; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextPostingsFormat.java b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextPostingsFormat.java index f23fdb69da9..a77050561c6 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextPostingsFormat.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextPostingsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.simpletext; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.simpletext; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.simpletext; + import java.io.IOException; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoFormat.java b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoFormat.java index bbdc80e3fb5..0823a888040 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoFormat.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.simpletext; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.simpletext; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.simpletext; + import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsFormat.java b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsFormat.java index 77b1ec1dde9..d783041167a 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsFormat.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.simpletext; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.simpletext; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.simpletext; + import java.io.IOException; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java index b410e19902a..ead8ecc800b 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.simpletext; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.simpletext; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.simpletext; + import java.io.IOException; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsWriter.java b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsWriter.java index 2abcff56473..00259b89711 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsWriter.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsWriter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.simpletext; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.simpletext; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.simpletext; + import java.io.IOException; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsFormat.java b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsFormat.java index 6960f5f4e39..e1feb2ba446 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsFormat.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.simpletext; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.simpletext; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.simpletext; + import java.io.IOException; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java index 9211367e583..4a468e935cd 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.simpletext; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.simpletext; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.simpletext; + import java.io.IOException; import java.util.Collections; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsWriter.java b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsWriter.java index b45d86c54c4..117ec19ae49 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsWriter.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsWriter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.simpletext; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.simpletext; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.simpletext; + import java.io.IOException; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextUtil.java b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextUtil.java index f09fa859e31..3bfbff05065 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextUtil.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextUtil.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.simpletext; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.simpletext; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.simpletext; + import java.io.IOException; import java.util.Locale; diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/package-info.java b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/package-info.java index 812a93c0867..c49e8cd0225 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/package-info.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Simpletext Codec: writes human readable postings. */ diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/autoprefix/TestAutoPrefixPostingsFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/autoprefix/TestAutoPrefixPostingsFormat.java index fa3cc702471..3c7059edb71 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/autoprefix/TestAutoPrefixPostingsFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/autoprefix/TestAutoPrefixPostingsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.autoprefix; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.autoprefix; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.autoprefix; + import org.apache.lucene.index.IndexOptions; import org.apache.lucene.index.RandomPostingsTester; diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/autoprefix/TestAutoPrefixTerms.java b/lucene/codecs/src/test/org/apache/lucene/codecs/autoprefix/TestAutoPrefixTerms.java index bfdce6fd33f..726c3f0a419 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/autoprefix/TestAutoPrefixTerms.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/autoprefix/TestAutoPrefixTerms.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.autoprefix; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.autoprefix; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.autoprefix; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestFixedGapPostingsFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestFixedGapPostingsFormat.java index 9cd5e85cb30..17b0c7f61e7 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestFixedGapPostingsFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestFixedGapPostingsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.blockterms; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.blockterms; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.blockterms; + import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BasePostingsFormatTestCase; diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestVarGapDocFreqIntervalPostingsFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestVarGapDocFreqIntervalPostingsFormat.java index b70dc6ec574..fa7dbcc13e2 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestVarGapDocFreqIntervalPostingsFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestVarGapDocFreqIntervalPostingsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.blockterms; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.blockterms; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.blockterms; + import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.blockterms.LuceneVarGapFixedInterval; diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestVarGapFixedIntervalPostingsFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestVarGapFixedIntervalPostingsFormat.java index 8ea4d1755c0..db9b4f538ff 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestVarGapFixedIntervalPostingsFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/blockterms/TestVarGapFixedIntervalPostingsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.blockterms; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.blockterms; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.blockterms; + import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.blockterms.LuceneVarGapDocFreqInterval; diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/blocktreeords/TestOrdsBlockTree.java b/lucene/codecs/src/test/org/apache/lucene/codecs/blocktreeords/TestOrdsBlockTree.java index a5a62c190eb..773bbf51827 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/blocktreeords/TestOrdsBlockTree.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/blocktreeords/TestOrdsBlockTree.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.blocktreeords; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.blocktreeords; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.blocktreeords; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/bloom/TestBloomPostingsFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/bloom/TestBloomPostingsFormat.java index 40863c897c5..37a46bfc91d 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/bloom/TestBloomPostingsFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/bloom/TestBloomPostingsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.bloom; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.bloom; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.bloom; + import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BasePostingsFormatTestCase; diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestDirectDocValuesFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestDirectDocValuesFormat.java index 1073c1107e7..3eb1f7b9d0e 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestDirectDocValuesFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestDirectDocValuesFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.memory; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.memory; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.memory; + import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BaseDocValuesFormatTestCase; diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestDirectPostingsFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestDirectPostingsFormat.java index afd261c98f4..9a36e52916a 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestDirectPostingsFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestDirectPostingsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.memory; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.memory; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.memory; + import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BasePostingsFormatTestCase; diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestFSTOrdPostingsFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestFSTOrdPostingsFormat.java index 8a7ad9f2559..ec860859a85 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestFSTOrdPostingsFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestFSTOrdPostingsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.memory; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.memory; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.memory; + import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BasePostingsFormatTestCase; diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestFSTPostingsFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestFSTPostingsFormat.java index 043968226da..939c5e33fe5 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestFSTPostingsFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestFSTPostingsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.memory; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.memory; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.memory; + import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BasePostingsFormatTestCase; diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestMemoryDocValuesFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestMemoryDocValuesFormat.java index 81b2367f399..1c83eec0a81 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestMemoryDocValuesFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestMemoryDocValuesFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.memory; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.memory; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.memory; + import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BaseCompressingDocValuesFormatTestCase; diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestMemoryPostingsFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestMemoryPostingsFormat.java index 36782b42b3d..3a56bf56744 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestMemoryPostingsFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestMemoryPostingsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.memory; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.memory; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.memory; + import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BasePostingsFormatTestCase; diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextCompoundFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextCompoundFormat.java index cda6df39aaf..ea38832593e 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextCompoundFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextCompoundFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.simpletext; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.simpletext; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.simpletext; + import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BaseCompoundFormatTestCase; diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextDocValuesFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextDocValuesFormat.java index 15129572064..155ab3a79a8 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextDocValuesFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextDocValuesFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.simpletext; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.simpletext; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.simpletext; + import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BaseDocValuesFormatTestCase; diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextFieldInfoFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextFieldInfoFormat.java index 68e5b95bbe6..e21f345429f 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextFieldInfoFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextFieldInfoFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.simpletext; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.simpletext; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.simpletext; + import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BaseFieldInfoFormatTestCase; diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextNormsFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextNormsFormat.java index 0a88ca802da..91e0c37c913 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextNormsFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextNormsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.simpletext; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.simpletext; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.simpletext; + import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BaseNormsFormatTestCase; diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextPointFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextPointFormat.java index 6ef9a61dcf7..7637584f3bc 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextPointFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextPointFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.simpletext; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.simpletext; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.simpletext; + import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BasePointFormatTestCase; diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextPostingsFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextPostingsFormat.java index 81219c6b44b..7df8e68a0c6 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextPostingsFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextPostingsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.simpletext; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.simpletext; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.simpletext; + import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BasePostingsFormatTestCase; diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextSegmentInfoFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextSegmentInfoFormat.java index 75be4ea4f59..2270f599c96 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextSegmentInfoFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextSegmentInfoFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.simpletext; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.simpletext; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.simpletext; + import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BaseSegmentInfoFormatTestCase; diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextStoredFieldsFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextStoredFieldsFormat.java index 9a8a2ff3c52..8eed1a52c50 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextStoredFieldsFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextStoredFieldsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.simpletext; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.simpletext; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.simpletext; + import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BaseStoredFieldsFormatTestCase; diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextTermVectorsFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextTermVectorsFormat.java index b0683c66d30..62df152ab28 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextTermVectorsFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextTermVectorsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.simpletext; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.simpletext; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.simpletext; + import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BaseTermVectorsFormatTestCase; diff --git a/lucene/core/src/java/org/apache/lucene/LucenePackage.java b/lucene/core/src/java/org/apache/lucene/LucenePackage.java index 225e054ed2d..02fe86e25f7 100644 --- a/lucene/core/src/java/org/apache/lucene/LucenePackage.java +++ b/lucene/core/src/java/org/apache/lucene/LucenePackage.java @@ -1,5 +1,3 @@ -package org.apache.lucene; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene; + /** Lucene's package information, including version. **/ public final class LucenePackage { diff --git a/lucene/core/src/java/org/apache/lucene/analysis/Analyzer.java b/lucene/core/src/java/org/apache/lucene/analysis/Analyzer.java index 96d6bc1ad30..cce740d14dc 100644 --- a/lucene/core/src/java/org/apache/lucene/analysis/Analyzer.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/Analyzer.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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis; + import java.io.Closeable; import java.io.Reader; diff --git a/lucene/core/src/java/org/apache/lucene/analysis/AnalyzerWrapper.java b/lucene/core/src/java/org/apache/lucene/analysis/AnalyzerWrapper.java index 3c97438b891..1e5640f71c0 100644 --- a/lucene/core/src/java/org/apache/lucene/analysis/AnalyzerWrapper.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/AnalyzerWrapper.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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis; + import java.io.Reader; diff --git a/lucene/core/src/java/org/apache/lucene/analysis/CachingTokenFilter.java b/lucene/core/src/java/org/apache/lucene/analysis/CachingTokenFilter.java index a8be8082496..010f41f0a22 100644 --- a/lucene/core/src/java/org/apache/lucene/analysis/CachingTokenFilter.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/CachingTokenFilter.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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/analysis/CharFilter.java b/lucene/core/src/java/org/apache/lucene/analysis/CharFilter.java index e6658af1b36..0a3fcaef230 100644 --- a/lucene/core/src/java/org/apache/lucene/analysis/CharFilter.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/CharFilter.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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/core/src/java/org/apache/lucene/analysis/DelegatingAnalyzerWrapper.java b/lucene/core/src/java/org/apache/lucene/analysis/DelegatingAnalyzerWrapper.java index 5e2934cf2d5..6f05d4d49d8 100644 --- a/lucene/core/src/java/org/apache/lucene/analysis/DelegatingAnalyzerWrapper.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/DelegatingAnalyzerWrapper.java @@ -1,7 +1,3 @@ -package org.apache.lucene.analysis; - -import java.io.Reader; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,10 @@ import java.io.Reader; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis; + +import java.io.Reader; + /** * An analyzer wrapper, that doesn't allow to wrap components or readers. diff --git a/lucene/core/src/java/org/apache/lucene/analysis/LegacyNumericTokenStream.java b/lucene/core/src/java/org/apache/lucene/analysis/LegacyNumericTokenStream.java index e7abf1f3f19..9bab26fd616 100644 --- a/lucene/core/src/java/org/apache/lucene/analysis/LegacyNumericTokenStream.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/LegacyNumericTokenStream.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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis; + import java.util.Objects; diff --git a/lucene/core/src/java/org/apache/lucene/analysis/ReusableStringReader.java b/lucene/core/src/java/org/apache/lucene/analysis/ReusableStringReader.java index a629c0d871e..c350534d067 100644 --- a/lucene/core/src/java/org/apache/lucene/analysis/ReusableStringReader.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/ReusableStringReader.java @@ -1,7 +1,3 @@ -package org.apache.lucene.analysis; - -import java.io.Reader; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,10 @@ import java.io.Reader; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis; + +import java.io.Reader; + /** Internal class to enable reuse of the string reader by {@link Analyzer#tokenStream(String,String)} */ final class ReusableStringReader extends Reader { diff --git a/lucene/core/src/java/org/apache/lucene/analysis/Token.java b/lucene/core/src/java/org/apache/lucene/analysis/Token.java index 1cdd78972b6..f2323a64e66 100644 --- a/lucene/core/src/java/org/apache/lucene/analysis/Token.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/Token.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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis; + import org.apache.lucene.analysis.tokenattributes.FlagsAttribute; import org.apache.lucene.analysis.tokenattributes.PackedTokenAttributeImpl; diff --git a/lucene/core/src/java/org/apache/lucene/analysis/TokenFilter.java b/lucene/core/src/java/org/apache/lucene/analysis/TokenFilter.java index 29612831549..c097c26893f 100644 --- a/lucene/core/src/java/org/apache/lucene/analysis/TokenFilter.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/TokenFilter.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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/analysis/TokenStream.java b/lucene/core/src/java/org/apache/lucene/analysis/TokenStream.java index 81178254465..6a78e1c0f38 100644 --- a/lucene/core/src/java/org/apache/lucene/analysis/TokenStream.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/TokenStream.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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis; + import java.io.IOException; import java.io.Closeable; diff --git a/lucene/core/src/java/org/apache/lucene/analysis/TokenStreamToAutomaton.java b/lucene/core/src/java/org/apache/lucene/analysis/TokenStreamToAutomaton.java index b62a5ff01eb..071fa4a975f 100644 --- a/lucene/core/src/java/org/apache/lucene/analysis/TokenStreamToAutomaton.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/TokenStreamToAutomaton.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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/analysis/Tokenizer.java b/lucene/core/src/java/org/apache/lucene/analysis/Tokenizer.java index c885360a1f9..33f972ad778 100644 --- a/lucene/core/src/java/org/apache/lucene/analysis/Tokenizer.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/Tokenizer.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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/core/src/java/org/apache/lucene/analysis/package-info.java b/lucene/core/src/java/org/apache/lucene/analysis/package-info.java index 511f26822e7..4a74866352f 100644 --- a/lucene/core/src/java/org/apache/lucene/analysis/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Text analysis. *

API and code to convert text into indexable/searchable tokens. Covers {@link org.apache.lucene.analysis.Analyzer} and related classes.

diff --git a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/BytesTermAttribute.java b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/BytesTermAttribute.java index 2085e5fa386..4c650865d35 100644 --- a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/BytesTermAttribute.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/BytesTermAttribute.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.tokenattributes; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.tokenattributes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.tokenattributes; + import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/BytesTermAttributeImpl.java b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/BytesTermAttributeImpl.java index 81fa816d29c..6cebb9d7542 100644 --- a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/BytesTermAttributeImpl.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/BytesTermAttributeImpl.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.tokenattributes; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.tokenattributes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.tokenattributes; + import java.util.Objects; diff --git a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttribute.java b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttribute.java index f9ec8eac59e..5e10bd798bb 100644 --- a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttribute.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttribute.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.tokenattributes; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.tokenattributes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.tokenattributes; + import org.apache.lucene.util.Attribute; diff --git a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttributeImpl.java b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttributeImpl.java index d75da21dd68..a1ac69bbafd 100644 --- a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttributeImpl.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttributeImpl.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.tokenattributes; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.tokenattributes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.tokenattributes; + import java.nio.CharBuffer; diff --git a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/FlagsAttribute.java b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/FlagsAttribute.java index 8e05ef50c86..842e47d06ff 100644 --- a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/FlagsAttribute.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/FlagsAttribute.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.tokenattributes; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.tokenattributes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.tokenattributes; + import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.util.Attribute; diff --git a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/FlagsAttributeImpl.java b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/FlagsAttributeImpl.java index b1c26e9aef4..208a32d2b20 100644 --- a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/FlagsAttributeImpl.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/FlagsAttributeImpl.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.tokenattributes; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.tokenattributes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.tokenattributes; + import org.apache.lucene.util.AttributeImpl; import org.apache.lucene.util.AttributeReflector; diff --git a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/KeywordAttribute.java b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/KeywordAttribute.java index d3906ab073b..8b99bc2eb8c 100644 --- a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/KeywordAttribute.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/KeywordAttribute.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.tokenattributes; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.tokenattributes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.tokenattributes; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.util.Attribute; diff --git a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/KeywordAttributeImpl.java b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/KeywordAttributeImpl.java index 37d2b897afa..bda62bbf34c 100644 --- a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/KeywordAttributeImpl.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/KeywordAttributeImpl.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.tokenattributes; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.tokenattributes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.tokenattributes; + import org.apache.lucene.util.AttributeImpl; import org.apache.lucene.util.AttributeReflector; diff --git a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/OffsetAttribute.java b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/OffsetAttribute.java index a0f87d5ad63..1153448cd2a 100644 --- a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/OffsetAttribute.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/OffsetAttribute.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.tokenattributes; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.tokenattributes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.tokenattributes; + import org.apache.lucene.util.Attribute; diff --git a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/OffsetAttributeImpl.java b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/OffsetAttributeImpl.java index 45ee5ad129c..cdc5d42e8cf 100644 --- a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/OffsetAttributeImpl.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/OffsetAttributeImpl.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.tokenattributes; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.tokenattributes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.tokenattributes; + import org.apache.lucene.util.AttributeImpl; import org.apache.lucene.util.AttributeReflector; diff --git a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PackedTokenAttributeImpl.java b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PackedTokenAttributeImpl.java index df280edf369..a84d7b70c26 100644 --- a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PackedTokenAttributeImpl.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PackedTokenAttributeImpl.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.tokenattributes; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.tokenattributes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.tokenattributes; + import org.apache.lucene.util.AttributeImpl; import org.apache.lucene.util.AttributeReflector; diff --git a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PayloadAttribute.java b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PayloadAttribute.java index fa63d9c361d..73ecdebb5e1 100644 --- a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PayloadAttribute.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PayloadAttribute.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.tokenattributes; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.tokenattributes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.tokenattributes; + import org.apache.lucene.util.Attribute; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PayloadAttributeImpl.java b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PayloadAttributeImpl.java index 1d4d98152ff..5eaed0cac78 100644 --- a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PayloadAttributeImpl.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PayloadAttributeImpl.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.tokenattributes; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.tokenattributes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.tokenattributes; + import org.apache.lucene.util.AttributeImpl; import org.apache.lucene.util.AttributeReflector; diff --git a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PositionIncrementAttribute.java b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PositionIncrementAttribute.java index 807987b26b2..2e73713be8c 100644 --- a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PositionIncrementAttribute.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PositionIncrementAttribute.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.tokenattributes; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.tokenattributes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.tokenattributes; + import org.apache.lucene.util.Attribute; diff --git a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PositionIncrementAttributeImpl.java b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PositionIncrementAttributeImpl.java index 1f0bffaa1b1..283f481f760 100644 --- a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PositionIncrementAttributeImpl.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PositionIncrementAttributeImpl.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.tokenattributes; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.tokenattributes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.tokenattributes; + import org.apache.lucene.util.AttributeImpl; import org.apache.lucene.util.AttributeReflector; diff --git a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PositionLengthAttribute.java b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PositionLengthAttribute.java index b402ead8f25..210eb0fcebc 100644 --- a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PositionLengthAttribute.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PositionLengthAttribute.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.tokenattributes; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.tokenattributes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.tokenattributes; + import org.apache.lucene.util.Attribute; diff --git a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PositionLengthAttributeImpl.java b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PositionLengthAttributeImpl.java index 672d43c0246..9bfdb49a5da 100644 --- a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PositionLengthAttributeImpl.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PositionLengthAttributeImpl.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.tokenattributes; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.tokenattributes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.tokenattributes; + import org.apache.lucene.util.AttributeImpl; import org.apache.lucene.util.AttributeReflector; diff --git a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/TermToBytesRefAttribute.java b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/TermToBytesRefAttribute.java index f6630da760f..7fe5e257d77 100644 --- a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/TermToBytesRefAttribute.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/TermToBytesRefAttribute.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.tokenattributes; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.tokenattributes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.tokenattributes; + import org.apache.lucene.util.Attribute; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/TypeAttribute.java b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/TypeAttribute.java index 00ee0d409dc..74ceb72d3d5 100644 --- a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/TypeAttribute.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/TypeAttribute.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.tokenattributes; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.tokenattributes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.tokenattributes; + import org.apache.lucene.util.Attribute; diff --git a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/TypeAttributeImpl.java b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/TypeAttributeImpl.java index d416d6a3482..7486b698f3e 100644 --- a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/TypeAttributeImpl.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/TypeAttributeImpl.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.tokenattributes; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.tokenattributes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.tokenattributes; + import org.apache.lucene.util.AttributeImpl; import org.apache.lucene.util.AttributeReflector; diff --git a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/package-info.java b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/package-info.java index 7ad002982d5..ab85ec66f6d 100644 --- a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * General-purpose attributes for text analysis. */ diff --git a/lucene/core/src/java/org/apache/lucene/codecs/BlockTermState.java b/lucene/core/src/java/org/apache/lucene/codecs/BlockTermState.java index 8ca6ad98c01..595bfbb8ad5 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/BlockTermState.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/BlockTermState.java @@ -1,4 +1,3 @@ -package org.apache.lucene.codecs; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.codecs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs; import org.apache.lucene.codecs.blocktree.BlockTreeTermsReader; // javadocs import org.apache.lucene.index.OrdTermState; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/Codec.java b/lucene/core/src/java/org/apache/lucene/codecs/Codec.java index 0613441deb3..a263acdd738 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/Codec.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/Codec.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs; + import java.util.Objects; import java.util.ServiceLoader; // javadocs diff --git a/lucene/core/src/java/org/apache/lucene/codecs/CodecUtil.java b/lucene/core/src/java/org/apache/lucene/codecs/CodecUtil.java index 9ff3cdbc464..addad0ffdbc 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/CodecUtil.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/CodecUtil.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs; + import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/CompoundFormat.java b/lucene/core/src/java/org/apache/lucene/codecs/CompoundFormat.java index 042a9b15e4c..954a78e0e7f 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/CompoundFormat.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/CompoundFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/DocValuesConsumer.java b/lucene/core/src/java/org/apache/lucene/codecs/DocValuesConsumer.java index 7339c3fa778..90abf2ad44b 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/DocValuesConsumer.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/DocValuesConsumer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs; + import java.io.Closeable; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/DocValuesFormat.java b/lucene/core/src/java/org/apache/lucene/codecs/DocValuesFormat.java index 0bd1efb8ccd..511a2b9f82d 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/DocValuesFormat.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/DocValuesFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs; + import java.io.IOException; import java.util.ServiceLoader; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/DocValuesProducer.java b/lucene/core/src/java/org/apache/lucene/codecs/DocValuesProducer.java index 32cd9d50baa..b6e136b5e13 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/DocValuesProducer.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/DocValuesProducer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs; + import java.io.Closeable; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/FieldInfosFormat.java b/lucene/core/src/java/org/apache/lucene/codecs/FieldInfosFormat.java index 3e21275f6f0..d4b21d79e81 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/FieldInfosFormat.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/FieldInfosFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/FieldsConsumer.java b/lucene/core/src/java/org/apache/lucene/codecs/FieldsConsumer.java index 7832726bc23..28bae1d07c5 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/FieldsConsumer.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/FieldsConsumer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs; + import java.io.Closeable; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/FieldsProducer.java b/lucene/core/src/java/org/apache/lucene/codecs/FieldsProducer.java index b9559906012..cd6386c721b 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/FieldsProducer.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/FieldsProducer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs; + import java.io.Closeable; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/FilterCodec.java b/lucene/core/src/java/org/apache/lucene/codecs/FilterCodec.java index f188d50385a..4fe236ea2cf 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/FilterCodec.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/FilterCodec.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs; + /** * A codec that forwards all its method calls to another codec. diff --git a/lucene/core/src/java/org/apache/lucene/codecs/LiveDocsFormat.java b/lucene/core/src/java/org/apache/lucene/codecs/LiveDocsFormat.java index 95a209dd207..40e98659c7a 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/LiveDocsFormat.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/LiveDocsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs; + import java.io.IOException; import java.util.Collection; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/MultiLevelSkipListReader.java b/lucene/core/src/java/org/apache/lucene/codecs/MultiLevelSkipListReader.java index bb59b9399d6..72ffe9f1a9d 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/MultiLevelSkipListReader.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/MultiLevelSkipListReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs; + import java.io.Closeable; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/MultiLevelSkipListWriter.java b/lucene/core/src/java/org/apache/lucene/codecs/MultiLevelSkipListWriter.java index 5fbb8207154..207b324d933 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/MultiLevelSkipListWriter.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/MultiLevelSkipListWriter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/NormsConsumer.java b/lucene/core/src/java/org/apache/lucene/codecs/NormsConsumer.java index d88ae5f81fa..b771aabf43a 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/NormsConsumer.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/NormsConsumer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs; + import java.io.Closeable; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/NormsFormat.java b/lucene/core/src/java/org/apache/lucene/codecs/NormsFormat.java index 0eb83b81127..6b5afbd44b8 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/NormsFormat.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/NormsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/NormsProducer.java b/lucene/core/src/java/org/apache/lucene/codecs/NormsProducer.java index fff5f1593b8..39f96121117 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/NormsProducer.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/NormsProducer.java @@ -1,12 +1,3 @@ -package org.apache.lucene.codecs; - -import java.io.Closeable; -import java.io.IOException; - -import org.apache.lucene.index.FieldInfo; -import org.apache.lucene.index.NumericDocValues; -import org.apache.lucene.util.Accountable; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -23,6 +14,15 @@ import org.apache.lucene.util.Accountable; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs; + +import java.io.Closeable; +import java.io.IOException; + +import org.apache.lucene.index.FieldInfo; +import org.apache.lucene.index.NumericDocValues; +import org.apache.lucene.util.Accountable; + /** Abstract API that produces field normalization values * diff --git a/lucene/core/src/java/org/apache/lucene/codecs/PointFormat.java b/lucene/core/src/java/org/apache/lucene/codecs/PointFormat.java index 953bc4d2f02..1d483582a8d 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/PointFormat.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/PointFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/PointReader.java b/lucene/core/src/java/org/apache/lucene/codecs/PointReader.java index aa2553fb6ac..70878409c4d 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/PointReader.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/PointReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs; + import java.io.Closeable; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/PointWriter.java b/lucene/core/src/java/org/apache/lucene/codecs/PointWriter.java index e53a8b0df68..fb809d736c9 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/PointWriter.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/PointWriter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs; + import java.io.Closeable; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/PostingsFormat.java b/lucene/core/src/java/org/apache/lucene/codecs/PostingsFormat.java index cad5b331d96..7994e057768 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/PostingsFormat.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/PostingsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs; + import java.io.IOException; import java.util.ServiceLoader; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/PostingsReaderBase.java b/lucene/core/src/java/org/apache/lucene/codecs/PostingsReaderBase.java index f054384e7c0..56cbab5dae4 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/PostingsReaderBase.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/PostingsReaderBase.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs; + import java.io.Closeable; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/PostingsWriterBase.java b/lucene/core/src/java/org/apache/lucene/codecs/PostingsWriterBase.java index 4df8f4ebcf8..b4f2d4e204d 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/PostingsWriterBase.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/PostingsWriterBase.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs; + import org.apache.lucene.codecs.blocktree.BlockTreeTermsWriter; import org.apache.lucene.index.FieldInfo; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/PushPostingsWriterBase.java b/lucene/core/src/java/org/apache/lucene/codecs/PushPostingsWriterBase.java index 3308e480fe5..1fb83b91724 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/PushPostingsWriterBase.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/PushPostingsWriterBase.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/SegmentInfoFormat.java b/lucene/core/src/java/org/apache/lucene/codecs/SegmentInfoFormat.java index e1892c79ab4..40daf573e1d 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/SegmentInfoFormat.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/SegmentInfoFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsFormat.java b/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsFormat.java index ed1d60634f1..549fe2f4721 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsFormat.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsReader.java b/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsReader.java index 43117d2bc9f..6258df54da8 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsReader.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsReader.java @@ -1,20 +1,20 @@ -package org.apache.lucene.codecs; - /* - * Copyright 2004 The Apache Software Foundation + * 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 * - * Licensed 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 + * 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. + * 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.codecs; import java.io.Closeable; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsWriter.java b/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsWriter.java index 109ae5cfcc3..b8cff117e5f 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsWriter.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsWriter.java @@ -1,20 +1,20 @@ -package org.apache.lucene.codecs; - /* - * Copyright 2004 The Apache Software Foundation + * 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 * - * Licensed 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 + * 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. + * 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.codecs; import java.io.Closeable; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/TermStats.java b/lucene/core/src/java/org/apache/lucene/codecs/TermStats.java index dfda70a821c..c3c2a4898d7 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/TermStats.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/TermStats.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs; + import org.apache.lucene.index.TermsEnum; // javadocs diff --git a/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsFormat.java b/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsFormat.java index 9888dd3bfd5..a0a65a64b15 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsFormat.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsReader.java b/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsReader.java index 04bea0a3025..71041369b56 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsReader.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs; + import java.io.Closeable; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsWriter.java b/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsWriter.java index 37f268bd4d7..1aff7379d37 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsWriter.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsWriter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs; + import java.io.Closeable; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/blocktree/AutoPrefixTermsWriter.java b/lucene/core/src/java/org/apache/lucene/codecs/blocktree/AutoPrefixTermsWriter.java index 701b40d3e16..501068d627a 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/blocktree/AutoPrefixTermsWriter.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/blocktree/AutoPrefixTermsWriter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.blocktree; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.blocktree; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.blocktree; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/blocktree/BitSetPostingsEnum.java b/lucene/core/src/java/org/apache/lucene/codecs/blocktree/BitSetPostingsEnum.java index bbf2cb98a59..c14de96b80a 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/blocktree/BitSetPostingsEnum.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/blocktree/BitSetPostingsEnum.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.blocktree; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.blocktree; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.blocktree; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/blocktree/BitSetTermsEnum.java b/lucene/core/src/java/org/apache/lucene/codecs/blocktree/BitSetTermsEnum.java index b94eb2f6935..ffc182fc122 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/blocktree/BitSetTermsEnum.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/blocktree/BitSetTermsEnum.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.blocktree; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.blocktree; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.blocktree; + import org.apache.lucene.codecs.PostingsWriterBase; import org.apache.lucene.index.PostingsEnum; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/blocktree/BlockTreeTermsReader.java b/lucene/core/src/java/org/apache/lucene/codecs/blocktree/BlockTreeTermsReader.java index 6cdd2b73861..03ec5170e5d 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/blocktree/BlockTreeTermsReader.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/blocktree/BlockTreeTermsReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.blocktree; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.blocktree; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.blocktree; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/blocktree/BlockTreeTermsWriter.java b/lucene/core/src/java/org/apache/lucene/codecs/blocktree/BlockTreeTermsWriter.java index eb242d8fc8d..340b0c94549 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/blocktree/BlockTreeTermsWriter.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/blocktree/BlockTreeTermsWriter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.blocktree; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.blocktree; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.blocktree; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/blocktree/FieldReader.java b/lucene/core/src/java/org/apache/lucene/codecs/blocktree/FieldReader.java index a51a125eb7a..1e92a43ad9f 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/blocktree/FieldReader.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/blocktree/FieldReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.blocktree; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.blocktree; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.blocktree; + import java.io.IOException; import java.util.Collection; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/blocktree/IntersectTermsEnum.java b/lucene/core/src/java/org/apache/lucene/codecs/blocktree/IntersectTermsEnum.java index 4764da72828..4d5b4cebffa 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/blocktree/IntersectTermsEnum.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/blocktree/IntersectTermsEnum.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.blocktree; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.blocktree; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.blocktree; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/blocktree/IntersectTermsEnumFrame.java b/lucene/core/src/java/org/apache/lucene/codecs/blocktree/IntersectTermsEnumFrame.java index 2122b380978..324107539c5 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/blocktree/IntersectTermsEnumFrame.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/blocktree/IntersectTermsEnumFrame.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.blocktree; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.blocktree; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.blocktree; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/blocktree/SegmentTermsEnum.java b/lucene/core/src/java/org/apache/lucene/codecs/blocktree/SegmentTermsEnum.java index 9ccb69cb1c6..73c32bbf810 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/blocktree/SegmentTermsEnum.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/blocktree/SegmentTermsEnum.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.blocktree; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.blocktree; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.blocktree; + import java.io.IOException; import java.io.PrintStream; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/blocktree/SegmentTermsEnumFrame.java b/lucene/core/src/java/org/apache/lucene/codecs/blocktree/SegmentTermsEnumFrame.java index 2bb9fd1f9ed..a2abbaf8b91 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/blocktree/SegmentTermsEnumFrame.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/blocktree/SegmentTermsEnumFrame.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.blocktree; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.blocktree; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.blocktree; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/blocktree/Stats.java b/lucene/core/src/java/org/apache/lucene/codecs/blocktree/Stats.java index 48dc3d9f090..f7995a383f6 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/blocktree/Stats.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/blocktree/Stats.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.blocktree; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.blocktree; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.blocktree; + import java.io.ByteArrayOutputStream; import java.io.PrintStream; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/blocktree/package-info.java b/lucene/core/src/java/org/apache/lucene/codecs/blocktree/package-info.java index 9cdbb02a790..4678778ef1e 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/blocktree/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/blocktree/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * BlockTree terms dictionary. * diff --git a/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsFormat.java b/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsFormat.java index 5f38d2eb60a..1b9f4b192dc 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsFormat.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.compressing; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.compressing; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.compressing; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsIndexReader.java b/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsIndexReader.java index 16bdb424575..0685d799497 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsIndexReader.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsIndexReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.compressing; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.compressing; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.compressing; + import static org.apache.lucene.util.BitUtil.zigZagDecode; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsIndexWriter.java b/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsIndexWriter.java index 9f766072db5..b90abdfe59e 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsIndexWriter.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsIndexWriter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.compressing; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.compressing; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.compressing; + import static org.apache.lucene.util.BitUtil.zigZagEncode; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsReader.java b/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsReader.java index e56cc091391..f49692836e2 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsReader.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.compressing; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.compressing; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.compressing; + import static org.apache.lucene.codecs.compressing.CompressingStoredFieldsWriter.BYTE_ARR; import static org.apache.lucene.codecs.compressing.CompressingStoredFieldsWriter.CODEC_SFX_DAT; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsWriter.java b/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsWriter.java index 6f4ed1624ad..79dfb27ad53 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsWriter.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsWriter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.compressing; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.compressing; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.compressing; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsFormat.java b/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsFormat.java index a8d50e07d6e..143f2b2980c 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsFormat.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.compressing; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.compressing; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.compressing; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java b/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java index 0cdeae1713d..f0d1640d85e 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.compressing; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.compressing; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.compressing; + import java.io.Closeable; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsWriter.java b/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsWriter.java index 0e9ad08f440..07f27117f0d 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsWriter.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsWriter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.compressing; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.compressing; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.compressing; + import java.io.IOException; import java.util.ArrayDeque; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressionMode.java b/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressionMode.java index ba041e95960..326eba32086 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressionMode.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressionMode.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.compressing; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.compressing; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.compressing; + import java.io.IOException; import java.util.zip.DataFormatException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/compressing/Compressor.java b/lucene/core/src/java/org/apache/lucene/codecs/compressing/Compressor.java index ef4fcc27789..bd2fadbd720 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/compressing/Compressor.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/compressing/Compressor.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.compressing; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.compressing; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.compressing; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/compressing/Decompressor.java b/lucene/core/src/java/org/apache/lucene/codecs/compressing/Decompressor.java index c7fffc7392d..b2f183392e5 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/compressing/Decompressor.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/compressing/Decompressor.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.compressing; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.compressing; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.compressing; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/compressing/GrowableByteArrayDataOutput.java b/lucene/core/src/java/org/apache/lucene/codecs/compressing/GrowableByteArrayDataOutput.java index 4d26455b941..67cfab6c7fb 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/compressing/GrowableByteArrayDataOutput.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/compressing/GrowableByteArrayDataOutput.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.compressing; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.compressing; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.compressing; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/compressing/LZ4.java b/lucene/core/src/java/org/apache/lucene/codecs/compressing/LZ4.java index d1fc3893bc2..44bc82c156f 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/compressing/LZ4.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/compressing/LZ4.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.compressing; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.compressing; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.compressing; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/compressing/MatchingReaders.java b/lucene/core/src/java/org/apache/lucene/codecs/compressing/MatchingReaders.java index b7846944833..286c5878f4b 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/compressing/MatchingReaders.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/compressing/MatchingReaders.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.compressing; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.compressing; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.compressing; + import org.apache.lucene.index.FieldInfo; import org.apache.lucene.index.MergeState; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/compressing/package-info.java b/lucene/core/src/java/org/apache/lucene/codecs/compressing/package-info.java index 9d3ce937326..189de336ed5 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/compressing/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/compressing/package-info.java @@ -13,8 +13,7 @@ * 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. - */ - + */ /** * StoredFieldsFormat that allows cross-document and cross-field compression of stored fields. */ diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene50/ForUtil.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene50/ForUtil.java index 10cbadced0b..5e8189ec7f1 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/lucene50/ForUtil.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene50/ForUtil.java @@ -1,4 +1,3 @@ -package org.apache.lucene.codecs.lucene50; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.codecs.lucene50; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene50; import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50CompoundFormat.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50CompoundFormat.java index 921fdaa73b1..2a40bde2ed5 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50CompoundFormat.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50CompoundFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene50; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene50; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene50; + import java.io.IOException; import java.util.Collection; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50CompoundReader.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50CompoundReader.java index b1cfc5dd36f..8cac8108a0a 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50CompoundReader.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50CompoundReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene50; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene50; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene50; + import org.apache.lucene.codecs.CodecUtil; import org.apache.lucene.index.CorruptIndexException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50FieldInfosFormat.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50FieldInfosFormat.java index 35edb066ddf..35931de7e01 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50FieldInfosFormat.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50FieldInfosFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene50; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene50; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene50; + import java.io.IOException; import java.util.Collections; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50LiveDocsFormat.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50LiveDocsFormat.java index 4cfb719e1c7..aac7375dfac 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50LiveDocsFormat.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50LiveDocsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene50; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene50; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene50; + import java.io.IOException; import java.util.Collection; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50PostingsFormat.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50PostingsFormat.java index a2bd71d0d24..4c4331c361c 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50PostingsFormat.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50PostingsFormat.java @@ -1,6 +1,3 @@ -package org.apache.lucene.codecs.lucene50; - - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +14,9 @@ package org.apache.lucene.codecs.lucene50; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene50; + + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50PostingsReader.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50PostingsReader.java index 31522689549..0dde774f9a8 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50PostingsReader.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50PostingsReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene50; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene50; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene50; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50PostingsWriter.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50PostingsWriter.java index c11f7d5640a..6d24a4cabb5 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50PostingsWriter.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50PostingsWriter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene50; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene50; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene50; + import static org.apache.lucene.codecs.lucene50.ForUtil.MAX_DATA_SIZE; import static org.apache.lucene.codecs.lucene50.ForUtil.MAX_ENCODED_SIZE; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50SegmentInfoFormat.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50SegmentInfoFormat.java index 9fa3a095739..68aacc62db8 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50SegmentInfoFormat.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50SegmentInfoFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene50; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene50; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene50; + import java.io.IOException; import java.util.Collections; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50SkipReader.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50SkipReader.java index 3efdc984576..8c037c5abb6 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50SkipReader.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50SkipReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene50; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene50; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene50; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50SkipWriter.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50SkipWriter.java index 4e659709fbc..a4556c69c05 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50SkipWriter.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50SkipWriter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene50; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene50; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene50; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50StoredFieldsFormat.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50StoredFieldsFormat.java index c3bdb6bc75f..10f8a69500d 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50StoredFieldsFormat.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50StoredFieldsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene50; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene50; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene50; + import java.io.IOException; import java.util.Objects; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50TermVectorsFormat.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50TermVectorsFormat.java index 719da8466b1..5ff4956e4c7 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50TermVectorsFormat.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50TermVectorsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene50; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene50; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene50; + import org.apache.lucene.codecs.CodecUtil; import org.apache.lucene.codecs.TermVectorsFormat; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene50/package-info.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene50/package-info.java index f76ac06392e..3cf6d0d13bc 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/lucene50/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene50/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Components from the Lucene 5.0 index format * See {@link org.apache.lucene.codecs.lucene53} for an overview diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene53/Lucene53NormsConsumer.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene53/Lucene53NormsConsumer.java index 88c04e3c533..b5f04ebb980 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/lucene53/Lucene53NormsConsumer.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene53/Lucene53NormsConsumer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene53; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene53; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene53; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene53/Lucene53NormsFormat.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene53/Lucene53NormsFormat.java index 91faf5d64be..15cdeccca2b 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/lucene53/Lucene53NormsFormat.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene53/Lucene53NormsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene53; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene53; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene53; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene53/Lucene53NormsProducer.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene53/Lucene53NormsProducer.java index de79b07cacb..c73e7701020 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/lucene53/Lucene53NormsProducer.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene53/Lucene53NormsProducer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene53; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene53; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene53; + import static org.apache.lucene.codecs.lucene53.Lucene53NormsFormat.VERSION_CURRENT; import static org.apache.lucene.codecs.lucene53.Lucene53NormsFormat.VERSION_START; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene53/package-info.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene53/package-info.java index 6a035323cd3..9f7b2c476a5 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/lucene53/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene53/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Components from the Lucene 5.3 index format * See {@link org.apache.lucene.codecs.lucene54} for an overview diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene54/Lucene54DocValuesConsumer.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene54/Lucene54DocValuesConsumer.java index f53d0377e22..858c54b362f 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/lucene54/Lucene54DocValuesConsumer.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene54/Lucene54DocValuesConsumer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene54; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene54; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene54; + import java.io.Closeable; // javadocs import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene54/Lucene54DocValuesFormat.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene54/Lucene54DocValuesFormat.java index c6e55cd2de4..800649c4757 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/lucene54/Lucene54DocValuesFormat.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene54/Lucene54DocValuesFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene54; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene54; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene54; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene54/Lucene54DocValuesProducer.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene54/Lucene54DocValuesProducer.java index b7388cb16ed..4e24c7a6653 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/lucene54/Lucene54DocValuesProducer.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene54/Lucene54DocValuesProducer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene54; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene54; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene54; + import java.io.Closeable; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene54/package-info.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene54/package-info.java index ebae8491bc2..5874f571bad 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/lucene54/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene54/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Lucene 5.4 file format. * diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene60/Lucene60Codec.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene60/Lucene60Codec.java index 435c6ad69aa..e9ef9a886cc 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/lucene60/Lucene60Codec.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene60/Lucene60Codec.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene60; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene60; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene60; + import java.util.Objects; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene60/Lucene60FieldInfosFormat.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene60/Lucene60FieldInfosFormat.java index a26883ff477..a35461e3ef7 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/lucene60/Lucene60FieldInfosFormat.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene60/Lucene60FieldInfosFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene60; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene60; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene60; + import java.io.IOException; import java.util.Collections; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene60/Lucene60PointFormat.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene60/Lucene60PointFormat.java index beec4bd340c..8ea932b7a64 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/lucene60/Lucene60PointFormat.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene60/Lucene60PointFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene60; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene60; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene60; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene60/Lucene60PointReader.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene60/Lucene60PointReader.java index 2d18019e553..2e9206ac9e7 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/lucene60/Lucene60PointReader.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene60/Lucene60PointReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene60; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene60; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene60; + import java.io.Closeable; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene60/Lucene60PointWriter.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene60/Lucene60PointWriter.java index 74acb4d30ee..9709ffbd431 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/lucene60/Lucene60PointWriter.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene60/Lucene60PointWriter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene60; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene60; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene60; + import java.io.Closeable; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene60/package-info.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene60/package-info.java index a52d6f6ad21..6ec8f547ff9 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/lucene60/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene60/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Lucene 6.0 file format. * diff --git a/lucene/core/src/java/org/apache/lucene/codecs/package-info.java b/lucene/core/src/java/org/apache/lucene/codecs/package-info.java index 28b260da498..0d950507048 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Codecs API: API for customization of the encoding and structure of the index. * diff --git a/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldDocValuesFormat.java b/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldDocValuesFormat.java index 5e33b0437fa..25566e072e9 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldDocValuesFormat.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldDocValuesFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.perfield; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.perfield; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.perfield; + import java.io.Closeable; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldPostingsFormat.java b/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldPostingsFormat.java index 6b736f80951..e49d2ff8cd1 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldPostingsFormat.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldPostingsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.perfield; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.perfield; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.perfield; + import java.io.Closeable; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/codecs/perfield/package-info.java b/lucene/core/src/java/org/apache/lucene/codecs/perfield/package-info.java index 4c0faa09ab7..7a04bc7dd9c 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/perfield/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/perfield/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Postings format that can delegate to different formats per-field. */ diff --git a/lucene/core/src/java/org/apache/lucene/document/BinaryDocValuesField.java b/lucene/core/src/java/org/apache/lucene/document/BinaryDocValuesField.java index c0c9c639a0f..b6a16de35bf 100644 --- a/lucene/core/src/java/org/apache/lucene/document/BinaryDocValuesField.java +++ b/lucene/core/src/java/org/apache/lucene/document/BinaryDocValuesField.java @@ -1,5 +1,3 @@ -package org.apache.lucene.document; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.document; + import org.apache.lucene.index.BinaryDocValues; import org.apache.lucene.index.DocValuesType; diff --git a/lucene/core/src/java/org/apache/lucene/document/BinaryPoint.java b/lucene/core/src/java/org/apache/lucene/document/BinaryPoint.java index a74b17c3e98..920ac42bc12 100644 --- a/lucene/core/src/java/org/apache/lucene/document/BinaryPoint.java +++ b/lucene/core/src/java/org/apache/lucene/document/BinaryPoint.java @@ -1,5 +1,3 @@ -package org.apache.lucene.document; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.document; + import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/java/org/apache/lucene/document/CompressionTools.java b/lucene/core/src/java/org/apache/lucene/document/CompressionTools.java index b30a34c5b1b..7ea3583a8d0 100644 --- a/lucene/core/src/java/org/apache/lucene/document/CompressionTools.java +++ b/lucene/core/src/java/org/apache/lucene/document/CompressionTools.java @@ -1,5 +1,3 @@ -package org.apache.lucene.document; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.document; + import java.util.zip.Deflater; import java.util.zip.Inflater; diff --git a/lucene/core/src/java/org/apache/lucene/document/DateTools.java b/lucene/core/src/java/org/apache/lucene/document/DateTools.java index e378ece28f5..e7ac4c50960 100644 --- a/lucene/core/src/java/org/apache/lucene/document/DateTools.java +++ b/lucene/core/src/java/org/apache/lucene/document/DateTools.java @@ -1,5 +1,3 @@ -package org.apache.lucene.document; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.document; + import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/lucene/core/src/java/org/apache/lucene/document/Document.java b/lucene/core/src/java/org/apache/lucene/document/Document.java index ee46eca5985..cdba083942f 100644 --- a/lucene/core/src/java/org/apache/lucene/document/Document.java +++ b/lucene/core/src/java/org/apache/lucene/document/Document.java @@ -1,5 +1,3 @@ -package org.apache.lucene.document; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.document; + import java.util.*; diff --git a/lucene/core/src/java/org/apache/lucene/document/DocumentStoredFieldVisitor.java b/lucene/core/src/java/org/apache/lucene/document/DocumentStoredFieldVisitor.java index 972fc09cf62..2762701899d 100644 --- a/lucene/core/src/java/org/apache/lucene/document/DocumentStoredFieldVisitor.java +++ b/lucene/core/src/java/org/apache/lucene/document/DocumentStoredFieldVisitor.java @@ -1,5 +1,3 @@ -package org.apache.lucene.document; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.document; + import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/lucene/core/src/java/org/apache/lucene/document/DoubleDocValuesField.java b/lucene/core/src/java/org/apache/lucene/document/DoubleDocValuesField.java index f0e14d53568..3c24ca45604 100644 --- a/lucene/core/src/java/org/apache/lucene/document/DoubleDocValuesField.java +++ b/lucene/core/src/java/org/apache/lucene/document/DoubleDocValuesField.java @@ -1,5 +1,3 @@ -package org.apache.lucene.document; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.document; + /** * Syntactic sugar for encoding doubles as NumericDocValues diff --git a/lucene/core/src/java/org/apache/lucene/document/DoublePoint.java b/lucene/core/src/java/org/apache/lucene/document/DoublePoint.java index a12a0c9853a..b50260b2a81 100644 --- a/lucene/core/src/java/org/apache/lucene/document/DoublePoint.java +++ b/lucene/core/src/java/org/apache/lucene/document/DoublePoint.java @@ -1,5 +1,3 @@ -package org.apache.lucene.document; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.document; + import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.NumericUtils; diff --git a/lucene/core/src/java/org/apache/lucene/document/Field.java b/lucene/core/src/java/org/apache/lucene/document/Field.java index 68f169928bb..dff2e58aa6e 100644 --- a/lucene/core/src/java/org/apache/lucene/document/Field.java +++ b/lucene/core/src/java/org/apache/lucene/document/Field.java @@ -1,5 +1,3 @@ -package org.apache.lucene.document; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.document; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/core/src/java/org/apache/lucene/document/FieldType.java b/lucene/core/src/java/org/apache/lucene/document/FieldType.java index c6a137b3823..413751bfd36 100644 --- a/lucene/core/src/java/org/apache/lucene/document/FieldType.java +++ b/lucene/core/src/java/org/apache/lucene/document/FieldType.java @@ -1,5 +1,3 @@ -package org.apache.lucene.document; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.document; + import org.apache.lucene.analysis.Analyzer; // javadocs import org.apache.lucene.index.DocValuesType; diff --git a/lucene/core/src/java/org/apache/lucene/document/FloatDocValuesField.java b/lucene/core/src/java/org/apache/lucene/document/FloatDocValuesField.java index db0524ff820..3a8bdea0ad9 100644 --- a/lucene/core/src/java/org/apache/lucene/document/FloatDocValuesField.java +++ b/lucene/core/src/java/org/apache/lucene/document/FloatDocValuesField.java @@ -1,5 +1,3 @@ -package org.apache.lucene.document; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.document; + /** * Syntactic sugar for encoding floats as NumericDocValues diff --git a/lucene/core/src/java/org/apache/lucene/document/FloatPoint.java b/lucene/core/src/java/org/apache/lucene/document/FloatPoint.java index 00766ef9cb8..8e0a257dbfb 100644 --- a/lucene/core/src/java/org/apache/lucene/document/FloatPoint.java +++ b/lucene/core/src/java/org/apache/lucene/document/FloatPoint.java @@ -1,5 +1,3 @@ -package org.apache.lucene.document; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.document; + import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.NumericUtils; diff --git a/lucene/core/src/java/org/apache/lucene/document/IntPoint.java b/lucene/core/src/java/org/apache/lucene/document/IntPoint.java index ef487066967..f582bf6b7e5 100644 --- a/lucene/core/src/java/org/apache/lucene/document/IntPoint.java +++ b/lucene/core/src/java/org/apache/lucene/document/IntPoint.java @@ -1,5 +1,3 @@ -package org.apache.lucene.document; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.document; + import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.NumericUtils; diff --git a/lucene/core/src/java/org/apache/lucene/document/LegacyDoubleField.java b/lucene/core/src/java/org/apache/lucene/document/LegacyDoubleField.java index eaebd61af89..55ba81cb120 100644 --- a/lucene/core/src/java/org/apache/lucene/document/LegacyDoubleField.java +++ b/lucene/core/src/java/org/apache/lucene/document/LegacyDoubleField.java @@ -1,5 +1,3 @@ -package org.apache.lucene.document; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.document; + import org.apache.lucene.index.IndexOptions; diff --git a/lucene/core/src/java/org/apache/lucene/document/LegacyFloatField.java b/lucene/core/src/java/org/apache/lucene/document/LegacyFloatField.java index e6ac0deb4a8..e24bf30fa54 100644 --- a/lucene/core/src/java/org/apache/lucene/document/LegacyFloatField.java +++ b/lucene/core/src/java/org/apache/lucene/document/LegacyFloatField.java @@ -1,5 +1,3 @@ -package org.apache.lucene.document; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.document; + import org.apache.lucene.index.IndexOptions; import org.apache.lucene.util.LegacyNumericUtils; diff --git a/lucene/core/src/java/org/apache/lucene/document/LegacyIntField.java b/lucene/core/src/java/org/apache/lucene/document/LegacyIntField.java index 3ad963bcbff..6eb0376ee64 100644 --- a/lucene/core/src/java/org/apache/lucene/document/LegacyIntField.java +++ b/lucene/core/src/java/org/apache/lucene/document/LegacyIntField.java @@ -1,5 +1,3 @@ -package org.apache.lucene.document; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.document; + import org.apache.lucene.index.IndexOptions; import org.apache.lucene.util.LegacyNumericUtils; diff --git a/lucene/core/src/java/org/apache/lucene/document/LegacyLongField.java b/lucene/core/src/java/org/apache/lucene/document/LegacyLongField.java index ce5c9949e1d..fa1851fe7e6 100644 --- a/lucene/core/src/java/org/apache/lucene/document/LegacyLongField.java +++ b/lucene/core/src/java/org/apache/lucene/document/LegacyLongField.java @@ -1,5 +1,3 @@ -package org.apache.lucene.document; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.document; + import org.apache.lucene.index.IndexOptions; diff --git a/lucene/core/src/java/org/apache/lucene/document/LongPoint.java b/lucene/core/src/java/org/apache/lucene/document/LongPoint.java index 15810d1aafb..e64526018e7 100644 --- a/lucene/core/src/java/org/apache/lucene/document/LongPoint.java +++ b/lucene/core/src/java/org/apache/lucene/document/LongPoint.java @@ -1,5 +1,3 @@ -package org.apache.lucene.document; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.document; + import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.NumericUtils; diff --git a/lucene/core/src/java/org/apache/lucene/document/NumericDocValuesField.java b/lucene/core/src/java/org/apache/lucene/document/NumericDocValuesField.java index 5d044b7c2f7..5b6dcc8dce2 100644 --- a/lucene/core/src/java/org/apache/lucene/document/NumericDocValuesField.java +++ b/lucene/core/src/java/org/apache/lucene/document/NumericDocValuesField.java @@ -1,5 +1,3 @@ -package org.apache.lucene.document; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.document; + import org.apache.lucene.index.DocValuesType; diff --git a/lucene/core/src/java/org/apache/lucene/document/SortedDocValuesField.java b/lucene/core/src/java/org/apache/lucene/document/SortedDocValuesField.java index 46966fda360..74afdea55e1 100644 --- a/lucene/core/src/java/org/apache/lucene/document/SortedDocValuesField.java +++ b/lucene/core/src/java/org/apache/lucene/document/SortedDocValuesField.java @@ -1,5 +1,3 @@ -package org.apache.lucene.document; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.document; + import org.apache.lucene.index.DocValuesType; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/java/org/apache/lucene/document/SortedNumericDocValuesField.java b/lucene/core/src/java/org/apache/lucene/document/SortedNumericDocValuesField.java index 4b66e6c5d41..40ceb2595c1 100644 --- a/lucene/core/src/java/org/apache/lucene/document/SortedNumericDocValuesField.java +++ b/lucene/core/src/java/org/apache/lucene/document/SortedNumericDocValuesField.java @@ -1,5 +1,3 @@ -package org.apache.lucene.document; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.document; + import org.apache.lucene.index.DocValuesType; diff --git a/lucene/core/src/java/org/apache/lucene/document/SortedSetDocValuesField.java b/lucene/core/src/java/org/apache/lucene/document/SortedSetDocValuesField.java index 23e635d18a8..5f4952b86ee 100644 --- a/lucene/core/src/java/org/apache/lucene/document/SortedSetDocValuesField.java +++ b/lucene/core/src/java/org/apache/lucene/document/SortedSetDocValuesField.java @@ -1,5 +1,3 @@ -package org.apache.lucene.document; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.document; + import org.apache.lucene.index.DocValuesType; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/java/org/apache/lucene/document/StoredField.java b/lucene/core/src/java/org/apache/lucene/document/StoredField.java index 440078528d6..1faff36bd67 100644 --- a/lucene/core/src/java/org/apache/lucene/document/StoredField.java +++ b/lucene/core/src/java/org/apache/lucene/document/StoredField.java @@ -1,5 +1,3 @@ -package org.apache.lucene.document; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.document; + import org.apache.lucene.index.IndexReader; // javadocs import org.apache.lucene.index.IndexableField; diff --git a/lucene/core/src/java/org/apache/lucene/document/StringField.java b/lucene/core/src/java/org/apache/lucene/document/StringField.java index e065cfd575a..b3c7fe0106b 100644 --- a/lucene/core/src/java/org/apache/lucene/document/StringField.java +++ b/lucene/core/src/java/org/apache/lucene/document/StringField.java @@ -1,5 +1,3 @@ -package org.apache.lucene.document; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.document; + import org.apache.lucene.index.IndexOptions; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/java/org/apache/lucene/document/TextField.java b/lucene/core/src/java/org/apache/lucene/document/TextField.java index b6a305335b6..ad0a5c39814 100644 --- a/lucene/core/src/java/org/apache/lucene/document/TextField.java +++ b/lucene/core/src/java/org/apache/lucene/document/TextField.java @@ -1,5 +1,3 @@ -package org.apache.lucene.document; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.document; + import java.io.Reader; diff --git a/lucene/core/src/java/org/apache/lucene/document/package-info.java b/lucene/core/src/java/org/apache/lucene/document/package-info.java index f3e8e5bcfae..d2a14e7dac5 100644 --- a/lucene/core/src/java/org/apache/lucene/document/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/document/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * The logical representation of a {@link org.apache.lucene.document.Document} for indexing and searching. *

The document package provides the user level logical representation of content to be indexed and searched. The diff --git a/lucene/core/src/java/org/apache/lucene/index/AbortingException.java b/lucene/core/src/java/org/apache/lucene/index/AbortingException.java index 1722980a473..c862e82f39d 100644 --- a/lucene/core/src/java/org/apache/lucene/index/AbortingException.java +++ b/lucene/core/src/java/org/apache/lucene/index/AbortingException.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + /** Thrown and caught internally in {@link IndexWriter} methods when an {@code IOException} would cause it to * lose previously indexed documents. When this happens, the {@link IndexWriter} is forcefully diff --git a/lucene/core/src/java/org/apache/lucene/index/AutomatonTermsEnum.java b/lucene/core/src/java/org/apache/lucene/index/AutomatonTermsEnum.java index fdd2b0e3c75..c322bb813e2 100644 --- a/lucene/core/src/java/org/apache/lucene/index/AutomatonTermsEnum.java +++ b/lucene/core/src/java/org/apache/lucene/index/AutomatonTermsEnum.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/index/BaseCompositeReader.java b/lucene/core/src/java/org/apache/lucene/index/BaseCompositeReader.java index a93a570e482..3256107d426 100644 --- a/lucene/core/src/java/org/apache/lucene/index/BaseCompositeReader.java +++ b/lucene/core/src/java/org/apache/lucene/index/BaseCompositeReader.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/index/BinaryDocValues.java b/lucene/core/src/java/org/apache/lucene/index/BinaryDocValues.java index 266c98eb3c9..d60a4e0391a 100644 --- a/lucene/core/src/java/org/apache/lucene/index/BinaryDocValues.java +++ b/lucene/core/src/java/org/apache/lucene/index/BinaryDocValues.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/java/org/apache/lucene/index/BinaryDocValuesFieldUpdates.java b/lucene/core/src/java/org/apache/lucene/index/BinaryDocValuesFieldUpdates.java index 684afefbbbc..f8cece9b5d3 100644 --- a/lucene/core/src/java/org/apache/lucene/index/BinaryDocValuesFieldUpdates.java +++ b/lucene/core/src/java/org/apache/lucene/index/BinaryDocValuesFieldUpdates.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.document.BinaryDocValuesField; import org.apache.lucene.search.DocIdSetIterator; diff --git a/lucene/core/src/java/org/apache/lucene/index/BinaryDocValuesWriter.java b/lucene/core/src/java/org/apache/lucene/index/BinaryDocValuesWriter.java index af90adcd423..03d9ff3db39 100644 --- a/lucene/core/src/java/org/apache/lucene/index/BinaryDocValuesWriter.java +++ b/lucene/core/src/java/org/apache/lucene/index/BinaryDocValuesWriter.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.Iterator; diff --git a/lucene/core/src/java/org/apache/lucene/index/BitsSlice.java b/lucene/core/src/java/org/apache/lucene/index/BitsSlice.java index 58b3549ded1..216d8f9d0be 100644 --- a/lucene/core/src/java/org/apache/lucene/index/BitsSlice.java +++ b/lucene/core/src/java/org/apache/lucene/index/BitsSlice.java @@ -1,7 +1,3 @@ -package org.apache.lucene.index; - -import org.apache.lucene.util.Bits; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,10 @@ import org.apache.lucene.util.Bits; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + +import org.apache.lucene.util.Bits; + /** * Exposes a slice of an existing Bits as a new Bits. diff --git a/lucene/core/src/java/org/apache/lucene/index/BufferedUpdates.java b/lucene/core/src/java/org/apache/lucene/index/BufferedUpdates.java index 1eb71648397..259547f1692 100644 --- a/lucene/core/src/java/org/apache/lucene/index/BufferedUpdates.java +++ b/lucene/core/src/java/org/apache/lucene/index/BufferedUpdates.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.util.ArrayList; import java.util.HashMap; diff --git a/lucene/core/src/java/org/apache/lucene/index/BufferedUpdatesStream.java b/lucene/core/src/java/org/apache/lucene/index/BufferedUpdatesStream.java index fb6b4aee443..bbf83e41700 100644 --- a/lucene/core/src/java/org/apache/lucene/index/BufferedUpdatesStream.java +++ b/lucene/core/src/java/org/apache/lucene/index/BufferedUpdatesStream.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/index/ByteSliceReader.java b/lucene/core/src/java/org/apache/lucene/index/ByteSliceReader.java index d64b378fbf4..aabc3d4b30c 100644 --- a/lucene/core/src/java/org/apache/lucene/index/ByteSliceReader.java +++ b/lucene/core/src/java/org/apache/lucene/index/ByteSliceReader.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/index/ByteSliceWriter.java b/lucene/core/src/java/org/apache/lucene/index/ByteSliceWriter.java index c0a3c2c0c42..b96f7fe1f04 100644 --- a/lucene/core/src/java/org/apache/lucene/index/ByteSliceWriter.java +++ b/lucene/core/src/java/org/apache/lucene/index/ByteSliceWriter.java @@ -1,8 +1,3 @@ -package org.apache.lucene.index; - -import org.apache.lucene.store.DataOutput; -import org.apache.lucene.util.ByteBlockPool; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -19,6 +14,11 @@ import org.apache.lucene.util.ByteBlockPool; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + +import org.apache.lucene.store.DataOutput; +import org.apache.lucene.util.ByteBlockPool; + /** diff --git a/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java b/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java index c3aa49f9a65..246784e7ab2 100644 --- a/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java +++ b/lucene/core/src/java/org/apache/lucene/index/CheckIndex.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.Closeable; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/index/CoalescedUpdates.java b/lucene/core/src/java/org/apache/lucene/index/CoalescedUpdates.java index 2d886ae0266..e908a99cb06 100644 --- a/lucene/core/src/java/org/apache/lucene/index/CoalescedUpdates.java +++ b/lucene/core/src/java/org/apache/lucene/index/CoalescedUpdates.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.util.ArrayList; import java.util.HashMap; diff --git a/lucene/core/src/java/org/apache/lucene/index/CodecReader.java b/lucene/core/src/java/org/apache/lucene/index/CodecReader.java index a5642e4c759..8a492c20b09 100644 --- a/lucene/core/src/java/org/apache/lucene/index/CodecReader.java +++ b/lucene/core/src/java/org/apache/lucene/index/CodecReader.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/index/CompositeReader.java b/lucene/core/src/java/org/apache/lucene/index/CompositeReader.java index def95deee96..0f6a44eb1e3 100644 --- a/lucene/core/src/java/org/apache/lucene/index/CompositeReader.java +++ b/lucene/core/src/java/org/apache/lucene/index/CompositeReader.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.util.List; diff --git a/lucene/core/src/java/org/apache/lucene/index/CompositeReaderContext.java b/lucene/core/src/java/org/apache/lucene/index/CompositeReaderContext.java index bc38eb32348..f4e70d4b956 100644 --- a/lucene/core/src/java/org/apache/lucene/index/CompositeReaderContext.java +++ b/lucene/core/src/java/org/apache/lucene/index/CompositeReaderContext.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.util.ArrayList; import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java b/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java index eb8f3a474cd..dc9a5e922b5 100644 --- a/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java +++ b/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/index/CorruptIndexException.java b/lucene/core/src/java/org/apache/lucene/index/CorruptIndexException.java index 3fff88fdcba..6fcbc77a13a 100644 --- a/lucene/core/src/java/org/apache/lucene/index/CorruptIndexException.java +++ b/lucene/core/src/java/org/apache/lucene/index/CorruptIndexException.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.Objects; diff --git a/lucene/core/src/java/org/apache/lucene/index/DefaultIndexingChain.java b/lucene/core/src/java/org/apache/lucene/index/DefaultIndexingChain.java index 500aff29d70..d1a68da78dd 100644 --- a/lucene/core/src/java/org/apache/lucene/index/DefaultIndexingChain.java +++ b/lucene/core/src/java/org/apache/lucene/index/DefaultIndexingChain.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/index/DirectoryReader.java b/lucene/core/src/java/org/apache/lucene/index/DirectoryReader.java index 3df0b70b510..f8a6b87a85b 100644 --- a/lucene/core/src/java/org/apache/lucene/index/DirectoryReader.java +++ b/lucene/core/src/java/org/apache/lucene/index/DirectoryReader.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.FileNotFoundException; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/index/DocConsumer.java b/lucene/core/src/java/org/apache/lucene/index/DocConsumer.java index 5f23ce7e0dd..c0c7ce1d747 100644 --- a/lucene/core/src/java/org/apache/lucene/index/DocConsumer.java +++ b/lucene/core/src/java/org/apache/lucene/index/DocConsumer.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/index/DocValues.java b/lucene/core/src/java/org/apache/lucene/index/DocValues.java index 91fcef13bba..feceb3bd3ff 100644 --- a/lucene/core/src/java/org/apache/lucene/index/DocValues.java +++ b/lucene/core/src/java/org/apache/lucene/index/DocValues.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/index/DocValuesFieldUpdates.java b/lucene/core/src/java/org/apache/lucene/index/DocValuesFieldUpdates.java index 0729c888411..6c8eaf0b8ea 100644 --- a/lucene/core/src/java/org/apache/lucene/index/DocValuesFieldUpdates.java +++ b/lucene/core/src/java/org/apache/lucene/index/DocValuesFieldUpdates.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.util.HashMap; import java.util.Map; diff --git a/lucene/core/src/java/org/apache/lucene/index/DocValuesType.java b/lucene/core/src/java/org/apache/lucene/index/DocValuesType.java index 74ad33a1ee7..422bd076d4b 100644 --- a/lucene/core/src/java/org/apache/lucene/index/DocValuesType.java +++ b/lucene/core/src/java/org/apache/lucene/index/DocValuesType.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + /** diff --git a/lucene/core/src/java/org/apache/lucene/index/DocValuesUpdate.java b/lucene/core/src/java/org/apache/lucene/index/DocValuesUpdate.java index 4a259aea32e..e7b17815085 100644 --- a/lucene/core/src/java/org/apache/lucene/index/DocValuesUpdate.java +++ b/lucene/core/src/java/org/apache/lucene/index/DocValuesUpdate.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import static org.apache.lucene.util.RamUsageEstimator.NUM_BYTES_ARRAY_HEADER; import static org.apache.lucene.util.RamUsageEstimator.NUM_BYTES_CHAR; diff --git a/lucene/core/src/java/org/apache/lucene/index/DocValuesWriter.java b/lucene/core/src/java/org/apache/lucene/index/DocValuesWriter.java index 838e2927b16..526a779d224 100644 --- a/lucene/core/src/java/org/apache/lucene/index/DocValuesWriter.java +++ b/lucene/core/src/java/org/apache/lucene/index/DocValuesWriter.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/index/DocumentsWriter.java b/lucene/core/src/java/org/apache/lucene/index/DocumentsWriter.java index 3269ebc0401..d5c1597579c 100644 --- a/lucene/core/src/java/org/apache/lucene/index/DocumentsWriter.java +++ b/lucene/core/src/java/org/apache/lucene/index/DocumentsWriter.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.Closeable; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterDeleteQueue.java b/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterDeleteQueue.java index 9265cb3d09c..04a0cfbeb4b 100644 --- a/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterDeleteQueue.java +++ b/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterDeleteQueue.java @@ -1,21 +1,20 @@ -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 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 - * + * 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. + * 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.index; import java.util.Arrays; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; diff --git a/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushControl.java b/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushControl.java index 6428b16b8f1..38547e609b9 100644 --- a/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushControl.java +++ b/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushControl.java @@ -1,14 +1,12 @@ -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 + * 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 + * the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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, @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.util.ArrayList; import java.util.IdentityHashMap; diff --git a/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushQueue.java b/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushQueue.java index 954a4bb7a42..2c62487a38b 100644 --- a/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushQueue.java +++ b/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushQueue.java @@ -1,20 +1,21 @@ -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 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 - * + * 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. + * 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.index; + import java.io.IOException; import java.util.LinkedList; import java.util.Queue; @@ -23,7 +24,6 @@ import java.util.concurrent.locks.ReentrantLock; import org.apache.lucene.index.DocumentsWriterPerThread.FlushedSegment; - /** * @lucene.internal */ diff --git a/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java b/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java index e3bcce0af71..e5998deb40a 100644 --- a/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java +++ b/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java @@ -1,14 +1,12 @@ -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 + * 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 + * the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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, @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.text.NumberFormat; diff --git a/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThreadPool.java b/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThreadPool.java index 6d67fb04fe7..63d2e96c4c9 100644 --- a/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThreadPool.java +++ b/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThreadPool.java @@ -1,13 +1,12 @@ -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 + * 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 + * the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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, @@ -15,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import org.apache.lucene.util.ThreadInterruptedException; import org.apache.lucene.util.ThreadInterruptedException; diff --git a/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterStallControl.java b/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterStallControl.java index 8ecd483a96a..84fa9afd92e 100644 --- a/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterStallControl.java +++ b/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterStallControl.java @@ -1,14 +1,12 @@ -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 + * 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 + * the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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, @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.util.IdentityHashMap; import java.util.Map; diff --git a/lucene/core/src/java/org/apache/lucene/index/ExitableDirectoryReader.java b/lucene/core/src/java/org/apache/lucene/index/ExitableDirectoryReader.java index 96fbd2c5e0c..ee1c0ceda2e 100644 --- a/lucene/core/src/java/org/apache/lucene/index/ExitableDirectoryReader.java +++ b/lucene/core/src/java/org/apache/lucene/index/ExitableDirectoryReader.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.index.FilterLeafReader.FilterFields; import org.apache.lucene.index.FilterLeafReader.FilterTerms; diff --git a/lucene/core/src/java/org/apache/lucene/index/FieldInfo.java b/lucene/core/src/java/org/apache/lucene/index/FieldInfo.java index 57dd2c52eca..2574bcefc41 100644 --- a/lucene/core/src/java/org/apache/lucene/index/FieldInfo.java +++ b/lucene/core/src/java/org/apache/lucene/index/FieldInfo.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.util.Map; import java.util.Objects; diff --git a/lucene/core/src/java/org/apache/lucene/index/FieldInfos.java b/lucene/core/src/java/org/apache/lucene/index/FieldInfos.java index 93f35e7af49..a49a9931dd1 100644 --- a/lucene/core/src/java/org/apache/lucene/index/FieldInfos.java +++ b/lucene/core/src/java/org/apache/lucene/index/FieldInfos.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.util.Collection; import java.util.Collections; diff --git a/lucene/core/src/java/org/apache/lucene/index/FieldTermIterator.java b/lucene/core/src/java/org/apache/lucene/index/FieldTermIterator.java index a7c54989980..271df022101 100644 --- a/lucene/core/src/java/org/apache/lucene/index/FieldTermIterator.java +++ b/lucene/core/src/java/org/apache/lucene/index/FieldTermIterator.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.util.BytesRefIterator; diff --git a/lucene/core/src/java/org/apache/lucene/index/Fields.java b/lucene/core/src/java/org/apache/lucene/index/Fields.java index d561916c660..c5794b61113 100644 --- a/lucene/core/src/java/org/apache/lucene/index/Fields.java +++ b/lucene/core/src/java/org/apache/lucene/index/Fields.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.Iterator; diff --git a/lucene/core/src/java/org/apache/lucene/index/FilterCodecReader.java b/lucene/core/src/java/org/apache/lucene/index/FilterCodecReader.java index 65275e2f720..8b2a55f0f94 100644 --- a/lucene/core/src/java/org/apache/lucene/index/FilterCodecReader.java +++ b/lucene/core/src/java/org/apache/lucene/index/FilterCodecReader.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.util.Objects; diff --git a/lucene/core/src/java/org/apache/lucene/index/FilterDirectoryReader.java b/lucene/core/src/java/org/apache/lucene/index/FilterDirectoryReader.java index 579cde960af..7003df53110 100644 --- a/lucene/core/src/java/org/apache/lucene/index/FilterDirectoryReader.java +++ b/lucene/core/src/java/org/apache/lucene/index/FilterDirectoryReader.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.List; diff --git a/lucene/core/src/java/org/apache/lucene/index/FilterLeafReader.java b/lucene/core/src/java/org/apache/lucene/index/FilterLeafReader.java index eadeffa7c89..98365a6cf65 100644 --- a/lucene/core/src/java/org/apache/lucene/index/FilterLeafReader.java +++ b/lucene/core/src/java/org/apache/lucene/index/FilterLeafReader.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.Iterator; diff --git a/lucene/core/src/java/org/apache/lucene/index/FilteredTermsEnum.java b/lucene/core/src/java/org/apache/lucene/index/FilteredTermsEnum.java index 3bb6f431041..6498dc0f325 100644 --- a/lucene/core/src/java/org/apache/lucene/index/FilteredTermsEnum.java +++ b/lucene/core/src/java/org/apache/lucene/index/FilteredTermsEnum.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/index/FlushByRamOrCountsPolicy.java b/lucene/core/src/java/org/apache/lucene/index/FlushByRamOrCountsPolicy.java index 8da0b9eb602..a85c98b7c9c 100644 --- a/lucene/core/src/java/org/apache/lucene/index/FlushByRamOrCountsPolicy.java +++ b/lucene/core/src/java/org/apache/lucene/index/FlushByRamOrCountsPolicy.java @@ -1,14 +1,12 @@ -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 + * 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 + * the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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, @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.index.DocumentsWriterPerThreadPool.ThreadState; diff --git a/lucene/core/src/java/org/apache/lucene/index/FlushPolicy.java b/lucene/core/src/java/org/apache/lucene/index/FlushPolicy.java index bddf58dd65e..e70959f3cce 100644 --- a/lucene/core/src/java/org/apache/lucene/index/FlushPolicy.java +++ b/lucene/core/src/java/org/apache/lucene/index/FlushPolicy.java @@ -1,14 +1,12 @@ -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 + * 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 + * the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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, @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.util.Iterator; import org.apache.lucene.index.DocumentsWriterPerThreadPool.ThreadState; diff --git a/lucene/core/src/java/org/apache/lucene/index/FreqProxFields.java b/lucene/core/src/java/org/apache/lucene/index/FreqProxFields.java index e078748fe0a..fb78a928279 100644 --- a/lucene/core/src/java/org/apache/lucene/index/FreqProxFields.java +++ b/lucene/core/src/java/org/apache/lucene/index/FreqProxFields.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.Iterator; diff --git a/lucene/core/src/java/org/apache/lucene/index/FreqProxTermsWriter.java b/lucene/core/src/java/org/apache/lucene/index/FreqProxTermsWriter.java index e4a64461f5b..efa1799b62f 100644 --- a/lucene/core/src/java/org/apache/lucene/index/FreqProxTermsWriter.java +++ b/lucene/core/src/java/org/apache/lucene/index/FreqProxTermsWriter.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/index/FreqProxTermsWriterPerField.java b/lucene/core/src/java/org/apache/lucene/index/FreqProxTermsWriterPerField.java index fae0d6f0b9c..0a7dcfd6d39 100644 --- a/lucene/core/src/java/org/apache/lucene/index/FreqProxTermsWriterPerField.java +++ b/lucene/core/src/java/org/apache/lucene/index/FreqProxTermsWriterPerField.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/index/FrozenBufferedUpdates.java b/lucene/core/src/java/org/apache/lucene/index/FrozenBufferedUpdates.java index 70ef92788f3..a3a57a30c36 100644 --- a/lucene/core/src/java/org/apache/lucene/index/FrozenBufferedUpdates.java +++ b/lucene/core/src/java/org/apache/lucene/index/FrozenBufferedUpdates.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.util.ArrayList; import java.util.Iterator; diff --git a/lucene/core/src/java/org/apache/lucene/index/IndexCommit.java b/lucene/core/src/java/org/apache/lucene/index/IndexCommit.java index f320a1ef76b..7c3ed72b857 100644 --- a/lucene/core/src/java/org/apache/lucene/index/IndexCommit.java +++ b/lucene/core/src/java/org/apache/lucene/index/IndexCommit.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 @@ -15,7 +13,8 @@ package org.apache.lucene.index; * 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.index; import java.util.Collection; import java.util.Map; diff --git a/lucene/core/src/java/org/apache/lucene/index/IndexDeletionPolicy.java b/lucene/core/src/java/org/apache/lucene/index/IndexDeletionPolicy.java index 4f582f6b7bd..b556a044421 100644 --- a/lucene/core/src/java/org/apache/lucene/index/IndexDeletionPolicy.java +++ b/lucene/core/src/java/org/apache/lucene/index/IndexDeletionPolicy.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.util.List; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/index/IndexFileDeleter.java b/lucene/core/src/java/org/apache/lucene/index/IndexFileDeleter.java index e2b29c9fc62..abe831b809b 100644 --- a/lucene/core/src/java/org/apache/lucene/index/IndexFileDeleter.java +++ b/lucene/core/src/java/org/apache/lucene/index/IndexFileDeleter.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.Closeable; import java.io.FileNotFoundException; diff --git a/lucene/core/src/java/org/apache/lucene/index/IndexFileNames.java b/lucene/core/src/java/org/apache/lucene/index/IndexFileNames.java index f0da20bf01c..c4bcd2c3cfa 100644 --- a/lucene/core/src/java/org/apache/lucene/index/IndexFileNames.java +++ b/lucene/core/src/java/org/apache/lucene/index/IndexFileNames.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.util.regex.Pattern; diff --git a/lucene/core/src/java/org/apache/lucene/index/IndexFormatTooNewException.java b/lucene/core/src/java/org/apache/lucene/index/IndexFormatTooNewException.java index 8d4fe1d58a3..a4b1376b79d 100644 --- a/lucene/core/src/java/org/apache/lucene/index/IndexFormatTooNewException.java +++ b/lucene/core/src/java/org/apache/lucene/index/IndexFormatTooNewException.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.index; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/index/IndexFormatTooOldException.java b/lucene/core/src/java/org/apache/lucene/index/IndexFormatTooOldException.java index 72f2276d163..0644dd69f3c 100644 --- a/lucene/core/src/java/org/apache/lucene/index/IndexFormatTooOldException.java +++ b/lucene/core/src/java/org/apache/lucene/index/IndexFormatTooOldException.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.index; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/index/IndexNotFoundException.java b/lucene/core/src/java/org/apache/lucene/index/IndexNotFoundException.java index 5fd15783146..ce6d3bdaef5 100644 --- a/lucene/core/src/java/org/apache/lucene/index/IndexNotFoundException.java +++ b/lucene/core/src/java/org/apache/lucene/index/IndexNotFoundException.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.FileNotFoundException; diff --git a/lucene/core/src/java/org/apache/lucene/index/IndexOptions.java b/lucene/core/src/java/org/apache/lucene/index/IndexOptions.java index 3fd5d25a97e..2927a925839 100644 --- a/lucene/core/src/java/org/apache/lucene/index/IndexOptions.java +++ b/lucene/core/src/java/org/apache/lucene/index/IndexOptions.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + /** * Controls how much information is stored in the postings lists. diff --git a/lucene/core/src/java/org/apache/lucene/index/IndexReader.java b/lucene/core/src/java/org/apache/lucene/index/IndexReader.java index f9f80f5788b..865f816bea2 100644 --- a/lucene/core/src/java/org/apache/lucene/index/IndexReader.java +++ b/lucene/core/src/java/org/apache/lucene/index/IndexReader.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.Closeable; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/index/IndexReaderContext.java b/lucene/core/src/java/org/apache/lucene/index/IndexReaderContext.java index a13abffe7ec..247fa57bc10 100644 --- a/lucene/core/src/java/org/apache/lucene/index/IndexReaderContext.java +++ b/lucene/core/src/java/org/apache/lucene/index/IndexReaderContext.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.util.List; diff --git a/lucene/core/src/java/org/apache/lucene/index/IndexUpgrader.java b/lucene/core/src/java/org/apache/lucene/index/IndexUpgrader.java index e8b2d52114f..02690c4bc6a 100644 --- a/lucene/core/src/java/org/apache/lucene/index/IndexUpgrader.java +++ b/lucene/core/src/java/org/apache/lucene/index/IndexUpgrader.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.store.Directory; import org.apache.lucene.store.FSDirectory; diff --git a/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java b/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java index b05e15a0c70..62ce8b82514 100644 --- a/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java +++ b/lucene/core/src/java/org/apache/lucene/index/IndexWriter.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.Closeable; import java.io.FileNotFoundException; diff --git a/lucene/core/src/java/org/apache/lucene/index/IndexWriterConfig.java b/lucene/core/src/java/org/apache/lucene/index/IndexWriterConfig.java index c2683ac7004..4a7cf7158b7 100644 --- a/lucene/core/src/java/org/apache/lucene/index/IndexWriterConfig.java +++ b/lucene/core/src/java/org/apache/lucene/index/IndexWriterConfig.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.PrintStream; diff --git a/lucene/core/src/java/org/apache/lucene/index/IndexableField.java b/lucene/core/src/java/org/apache/lucene/index/IndexableField.java index 2045f45af9b..f6fc6157442 100644 --- a/lucene/core/src/java/org/apache/lucene/index/IndexableField.java +++ b/lucene/core/src/java/org/apache/lucene/index/IndexableField.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.Reader; diff --git a/lucene/core/src/java/org/apache/lucene/index/IndexableFieldType.java b/lucene/core/src/java/org/apache/lucene/index/IndexableFieldType.java index cf87b44dc0f..a797cf80301 100644 --- a/lucene/core/src/java/org/apache/lucene/index/IndexableFieldType.java +++ b/lucene/core/src/java/org/apache/lucene/index/IndexableFieldType.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.analysis.Analyzer; // javadocs diff --git a/lucene/core/src/java/org/apache/lucene/index/KeepOnlyLastCommitDeletionPolicy.java b/lucene/core/src/java/org/apache/lucene/index/KeepOnlyLastCommitDeletionPolicy.java index d0615ecd496..573103b6929 100644 --- a/lucene/core/src/java/org/apache/lucene/index/KeepOnlyLastCommitDeletionPolicy.java +++ b/lucene/core/src/java/org/apache/lucene/index/KeepOnlyLastCommitDeletionPolicy.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.util.List; diff --git a/lucene/core/src/java/org/apache/lucene/index/LeafReader.java b/lucene/core/src/java/org/apache/lucene/index/LeafReader.java index 9baaeb6e9bb..76db6005f84 100644 --- a/lucene/core/src/java/org/apache/lucene/index/LeafReader.java +++ b/lucene/core/src/java/org/apache/lucene/index/LeafReader.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/index/LeafReaderContext.java b/lucene/core/src/java/org/apache/lucene/index/LeafReaderContext.java index b6c32dfb5d2..12dc8c18a5c 100644 --- a/lucene/core/src/java/org/apache/lucene/index/LeafReaderContext.java +++ b/lucene/core/src/java/org/apache/lucene/index/LeafReaderContext.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.util.Collections; import java.util.List; diff --git a/lucene/core/src/java/org/apache/lucene/index/LiveIndexWriterConfig.java b/lucene/core/src/java/org/apache/lucene/index/LiveIndexWriterConfig.java index 335878129e5..1a0002c73f7 100644 --- a/lucene/core/src/java/org/apache/lucene/index/LiveIndexWriterConfig.java +++ b/lucene/core/src/java/org/apache/lucene/index/LiveIndexWriterConfig.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.codecs.Codec; diff --git a/lucene/core/src/java/org/apache/lucene/index/LogByteSizeMergePolicy.java b/lucene/core/src/java/org/apache/lucene/index/LogByteSizeMergePolicy.java index 9e92455b92c..a82f4a0e3f9 100644 --- a/lucene/core/src/java/org/apache/lucene/index/LogByteSizeMergePolicy.java +++ b/lucene/core/src/java/org/apache/lucene/index/LogByteSizeMergePolicy.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/index/LogDocMergePolicy.java b/lucene/core/src/java/org/apache/lucene/index/LogDocMergePolicy.java index 1b9a061f0f3..e1c0297784c 100644 --- a/lucene/core/src/java/org/apache/lucene/index/LogDocMergePolicy.java +++ b/lucene/core/src/java/org/apache/lucene/index/LogDocMergePolicy.java @@ -1,7 +1,3 @@ -package org.apache.lucene.index; - -import java.io.IOException; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,10 @@ import java.io.IOException; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + +import java.io.IOException; + /** This is a {@link LogMergePolicy} that measures size of a * segment as the number of documents (not taking deletions diff --git a/lucene/core/src/java/org/apache/lucene/index/LogMergePolicy.java b/lucene/core/src/java/org/apache/lucene/index/LogMergePolicy.java index a8d4ed7177e..11869dc2477 100644 --- a/lucene/core/src/java/org/apache/lucene/index/LogMergePolicy.java +++ b/lucene/core/src/java/org/apache/lucene/index/LogMergePolicy.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/index/MappedMultiFields.java b/lucene/core/src/java/org/apache/lucene/index/MappedMultiFields.java index fe41bc807f8..280b52b1c95 100644 --- a/lucene/core/src/java/org/apache/lucene/index/MappedMultiFields.java +++ b/lucene/core/src/java/org/apache/lucene/index/MappedMultiFields.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/index/MappingMultiPostingsEnum.java b/lucene/core/src/java/org/apache/lucene/index/MappingMultiPostingsEnum.java index 5d6c5050d91..a06c34f3c80 100644 --- a/lucene/core/src/java/org/apache/lucene/index/MappingMultiPostingsEnum.java +++ b/lucene/core/src/java/org/apache/lucene/index/MappingMultiPostingsEnum.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/index/MergePolicy.java b/lucene/core/src/java/org/apache/lucene/index/MergePolicy.java index 10a9ece09c2..1d67c4a0abc 100644 --- a/lucene/core/src/java/org/apache/lucene/index/MergePolicy.java +++ b/lucene/core/src/java/org/apache/lucene/index/MergePolicy.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/index/MergeRateLimiter.java b/lucene/core/src/java/org/apache/lucene/index/MergeRateLimiter.java index 9b19560129b..d04c2d2299f 100644 --- a/lucene/core/src/java/org/apache/lucene/index/MergeRateLimiter.java +++ b/lucene/core/src/java/org/apache/lucene/index/MergeRateLimiter.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.store.RateLimiter; import org.apache.lucene.util.ThreadInterruptedException; diff --git a/lucene/core/src/java/org/apache/lucene/index/MergeScheduler.java b/lucene/core/src/java/org/apache/lucene/index/MergeScheduler.java index ae451ce9cef..3a9f98f45ee 100644 --- a/lucene/core/src/java/org/apache/lucene/index/MergeScheduler.java +++ b/lucene/core/src/java/org/apache/lucene/index/MergeScheduler.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.Closeable; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/index/MergeState.java b/lucene/core/src/java/org/apache/lucene/index/MergeState.java index 09bdfbd61da..531c7994a86 100644 --- a/lucene/core/src/java/org/apache/lucene/index/MergeState.java +++ b/lucene/core/src/java/org/apache/lucene/index/MergeState.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.List; diff --git a/lucene/core/src/java/org/apache/lucene/index/MergeTrigger.java b/lucene/core/src/java/org/apache/lucene/index/MergeTrigger.java index eb31c2c762c..fd4b6131296 100644 --- a/lucene/core/src/java/org/apache/lucene/index/MergeTrigger.java +++ b/lucene/core/src/java/org/apache/lucene/index/MergeTrigger.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + /** * MergeTrigger is passed to diff --git a/lucene/core/src/java/org/apache/lucene/index/MergedPrefixCodedTermsIterator.java b/lucene/core/src/java/org/apache/lucene/index/MergedPrefixCodedTermsIterator.java index c73a2fe0113..cd14eecc2c8 100644 --- a/lucene/core/src/java/org/apache/lucene/index/MergedPrefixCodedTermsIterator.java +++ b/lucene/core/src/java/org/apache/lucene/index/MergedPrefixCodedTermsIterator.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.util.List; diff --git a/lucene/core/src/java/org/apache/lucene/index/MultiBits.java b/lucene/core/src/java/org/apache/lucene/index/MultiBits.java index 228a242d69e..3f4397f6ae8 100644 --- a/lucene/core/src/java/org/apache/lucene/index/MultiBits.java +++ b/lucene/core/src/java/org/apache/lucene/index/MultiBits.java @@ -1,7 +1,3 @@ -package org.apache.lucene.index; - -import org.apache.lucene.util.Bits; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,10 @@ import org.apache.lucene.util.Bits; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + +import org.apache.lucene.util.Bits; + /** * Concatenates multiple Bits together, on every lookup. diff --git a/lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java b/lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java index 3da30ffbda0..383139f45f8 100644 --- a/lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java +++ b/lucene/core/src/java/org/apache/lucene/index/MultiDocValues.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/index/MultiFields.java b/lucene/core/src/java/org/apache/lucene/index/MultiFields.java index 9348009ab32..1736bace115 100644 --- a/lucene/core/src/java/org/apache/lucene/index/MultiFields.java +++ b/lucene/core/src/java/org/apache/lucene/index/MultiFields.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/index/MultiPointValues.java b/lucene/core/src/java/org/apache/lucene/index/MultiPointValues.java index 5dd4fcc111c..dcc33da4aed 100644 --- a/lucene/core/src/java/org/apache/lucene/index/MultiPointValues.java +++ b/lucene/core/src/java/org/apache/lucene/index/MultiPointValues.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/index/MultiPostingsEnum.java b/lucene/core/src/java/org/apache/lucene/index/MultiPostingsEnum.java index 27fc9adb763..54563254162 100644 --- a/lucene/core/src/java/org/apache/lucene/index/MultiPostingsEnum.java +++ b/lucene/core/src/java/org/apache/lucene/index/MultiPostingsEnum.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/index/MultiReader.java b/lucene/core/src/java/org/apache/lucene/index/MultiReader.java index 19aaa905a18..8f1bb66ae63 100644 --- a/lucene/core/src/java/org/apache/lucene/index/MultiReader.java +++ b/lucene/core/src/java/org/apache/lucene/index/MultiReader.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/index/MultiTerms.java b/lucene/core/src/java/org/apache/lucene/index/MultiTerms.java index b6283e053d4..79e11c45eee 100644 --- a/lucene/core/src/java/org/apache/lucene/index/MultiTerms.java +++ b/lucene/core/src/java/org/apache/lucene/index/MultiTerms.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/index/MultiTermsEnum.java b/lucene/core/src/java/org/apache/lucene/index/MultiTermsEnum.java index f173a641e4b..ac6887f8c33 100644 --- a/lucene/core/src/java/org/apache/lucene/index/MultiTermsEnum.java +++ b/lucene/core/src/java/org/apache/lucene/index/MultiTermsEnum.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/index/NoDeletionPolicy.java b/lucene/core/src/java/org/apache/lucene/index/NoDeletionPolicy.java index 2791cdef4c8..9b211e19066 100644 --- a/lucene/core/src/java/org/apache/lucene/index/NoDeletionPolicy.java +++ b/lucene/core/src/java/org/apache/lucene/index/NoDeletionPolicy.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.util.List; diff --git a/lucene/core/src/java/org/apache/lucene/index/NoMergePolicy.java b/lucene/core/src/java/org/apache/lucene/index/NoMergePolicy.java index cade1353f0b..ec309b8a297 100644 --- a/lucene/core/src/java/org/apache/lucene/index/NoMergePolicy.java +++ b/lucene/core/src/java/org/apache/lucene/index/NoMergePolicy.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.Map; diff --git a/lucene/core/src/java/org/apache/lucene/index/NoMergeScheduler.java b/lucene/core/src/java/org/apache/lucene/index/NoMergeScheduler.java index c4a6bc1419c..16306535afc 100644 --- a/lucene/core/src/java/org/apache/lucene/index/NoMergeScheduler.java +++ b/lucene/core/src/java/org/apache/lucene/index/NoMergeScheduler.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + /** * A {@link MergeScheduler} which never executes any merges. It is also a diff --git a/lucene/core/src/java/org/apache/lucene/index/NormValuesWriter.java b/lucene/core/src/java/org/apache/lucene/index/NormValuesWriter.java index d7f164ecc61..a9797a10d8b 100644 --- a/lucene/core/src/java/org/apache/lucene/index/NormValuesWriter.java +++ b/lucene/core/src/java/org/apache/lucene/index/NormValuesWriter.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.Iterator; diff --git a/lucene/core/src/java/org/apache/lucene/index/NumericDocValues.java b/lucene/core/src/java/org/apache/lucene/index/NumericDocValues.java index 526b1f3e36a..33ab33bd91c 100644 --- a/lucene/core/src/java/org/apache/lucene/index/NumericDocValues.java +++ b/lucene/core/src/java/org/apache/lucene/index/NumericDocValues.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + /** * A per-document numeric value. diff --git a/lucene/core/src/java/org/apache/lucene/index/NumericDocValuesFieldUpdates.java b/lucene/core/src/java/org/apache/lucene/index/NumericDocValuesFieldUpdates.java index 641c594d388..1d286118312 100644 --- a/lucene/core/src/java/org/apache/lucene/index/NumericDocValuesFieldUpdates.java +++ b/lucene/core/src/java/org/apache/lucene/index/NumericDocValuesFieldUpdates.java @@ -1,12 +1,3 @@ -package org.apache.lucene.index; - -import org.apache.lucene.document.NumericDocValuesField; -import org.apache.lucene.search.DocIdSetIterator; -import org.apache.lucene.util.InPlaceMergeSorter; -import org.apache.lucene.util.packed.PackedInts; -import org.apache.lucene.util.packed.PagedGrowableWriter; -import org.apache.lucene.util.packed.PagedMutable; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -23,6 +14,15 @@ import org.apache.lucene.util.packed.PagedMutable; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + +import org.apache.lucene.document.NumericDocValuesField; +import org.apache.lucene.search.DocIdSetIterator; +import org.apache.lucene.util.InPlaceMergeSorter; +import org.apache.lucene.util.packed.PackedInts; +import org.apache.lucene.util.packed.PagedGrowableWriter; +import org.apache.lucene.util.packed.PagedMutable; + /** * A {@link DocValuesFieldUpdates} which holds updates of documents, of a single diff --git a/lucene/core/src/java/org/apache/lucene/index/NumericDocValuesWriter.java b/lucene/core/src/java/org/apache/lucene/index/NumericDocValuesWriter.java index d37fd6ab6e8..917af666814 100644 --- a/lucene/core/src/java/org/apache/lucene/index/NumericDocValuesWriter.java +++ b/lucene/core/src/java/org/apache/lucene/index/NumericDocValuesWriter.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.Iterator; diff --git a/lucene/core/src/java/org/apache/lucene/index/OrdTermState.java b/lucene/core/src/java/org/apache/lucene/index/OrdTermState.java index 825c1129b59..274e7ff452b 100644 --- a/lucene/core/src/java/org/apache/lucene/index/OrdTermState.java +++ b/lucene/core/src/java/org/apache/lucene/index/OrdTermState.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + /** * An ordinal based {@link TermState} diff --git a/lucene/core/src/java/org/apache/lucene/index/ParallelCompositeReader.java b/lucene/core/src/java/org/apache/lucene/index/ParallelCompositeReader.java index 5132f608a45..dd829765ae0 100644 --- a/lucene/core/src/java/org/apache/lucene/index/ParallelCompositeReader.java +++ b/lucene/core/src/java/org/apache/lucene/index/ParallelCompositeReader.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.Collections; diff --git a/lucene/core/src/java/org/apache/lucene/index/ParallelLeafReader.java b/lucene/core/src/java/org/apache/lucene/index/ParallelLeafReader.java index 73c605f7fb1..3d51a0bea6d 100644 --- a/lucene/core/src/java/org/apache/lucene/index/ParallelLeafReader.java +++ b/lucene/core/src/java/org/apache/lucene/index/ParallelLeafReader.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.Collections; diff --git a/lucene/core/src/java/org/apache/lucene/index/ParallelPostingsArray.java b/lucene/core/src/java/org/apache/lucene/index/ParallelPostingsArray.java index 75f223f6a65..400f4416cf4 100644 --- a/lucene/core/src/java/org/apache/lucene/index/ParallelPostingsArray.java +++ b/lucene/core/src/java/org/apache/lucene/index/ParallelPostingsArray.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.RamUsageEstimator; diff --git a/lucene/core/src/java/org/apache/lucene/index/PersistentSnapshotDeletionPolicy.java b/lucene/core/src/java/org/apache/lucene/index/PersistentSnapshotDeletionPolicy.java index 04648522e10..82dfcf9bb05 100644 --- a/lucene/core/src/java/org/apache/lucene/index/PersistentSnapshotDeletionPolicy.java +++ b/lucene/core/src/java/org/apache/lucene/index/PersistentSnapshotDeletionPolicy.java @@ -1,21 +1,20 @@ -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 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 - * + * 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. + * 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.index; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/index/PointValues.java b/lucene/core/src/java/org/apache/lucene/index/PointValues.java index 488baeb26d4..0392b5c9475 100644 --- a/lucene/core/src/java/org/apache/lucene/index/PointValues.java +++ b/lucene/core/src/java/org/apache/lucene/index/PointValues.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/index/PointValuesWriter.java b/lucene/core/src/java/org/apache/lucene/index/PointValuesWriter.java index e05f270977f..1008f05d8b8 100644 --- a/lucene/core/src/java/org/apache/lucene/index/PointValuesWriter.java +++ b/lucene/core/src/java/org/apache/lucene/index/PointValuesWriter.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/index/PostingsEnum.java b/lucene/core/src/java/org/apache/lucene/index/PostingsEnum.java index 3a28f5c6956..fdd32a9f2fe 100644 --- a/lucene/core/src/java/org/apache/lucene/index/PostingsEnum.java +++ b/lucene/core/src/java/org/apache/lucene/index/PostingsEnum.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/index/PrefixCodedTerms.java b/lucene/core/src/java/org/apache/lucene/index/PrefixCodedTerms.java index 7f5b1a41759..d4b23febf04 100644 --- a/lucene/core/src/java/org/apache/lucene/index/PrefixCodedTerms.java +++ b/lucene/core/src/java/org/apache/lucene/index/PrefixCodedTerms.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.Objects; diff --git a/lucene/core/src/java/org/apache/lucene/index/QueryTimeout.java b/lucene/core/src/java/org/apache/lucene/index/QueryTimeout.java index e519ab787a8..f0bc3064e70 100644 --- a/lucene/core/src/java/org/apache/lucene/index/QueryTimeout.java +++ b/lucene/core/src/java/org/apache/lucene/index/QueryTimeout.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + /** * Base for query timeout implementations, which will provide a {@code shouldExit()} method, diff --git a/lucene/core/src/java/org/apache/lucene/index/QueryTimeoutImpl.java b/lucene/core/src/java/org/apache/lucene/index/QueryTimeoutImpl.java index 03186ba30ef..8a18e386545 100644 --- a/lucene/core/src/java/org/apache/lucene/index/QueryTimeoutImpl.java +++ b/lucene/core/src/java/org/apache/lucene/index/QueryTimeoutImpl.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.util.concurrent.TimeUnit; diff --git a/lucene/core/src/java/org/apache/lucene/index/RandomAccessOrds.java b/lucene/core/src/java/org/apache/lucene/index/RandomAccessOrds.java index eafff937a5b..d0494f5dd36 100644 --- a/lucene/core/src/java/org/apache/lucene/index/RandomAccessOrds.java +++ b/lucene/core/src/java/org/apache/lucene/index/RandomAccessOrds.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + /** * Extension of {@link SortedSetDocValues} that supports random access diff --git a/lucene/core/src/java/org/apache/lucene/index/ReaderManager.java b/lucene/core/src/java/org/apache/lucene/index/ReaderManager.java index 79d9a948d5a..380a3c02bef 100644 --- a/lucene/core/src/java/org/apache/lucene/index/ReaderManager.java +++ b/lucene/core/src/java/org/apache/lucene/index/ReaderManager.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/index/ReaderSlice.java b/lucene/core/src/java/org/apache/lucene/index/ReaderSlice.java index 2f5a9b373df..2c00a3d2f0f 100644 --- a/lucene/core/src/java/org/apache/lucene/index/ReaderSlice.java +++ b/lucene/core/src/java/org/apache/lucene/index/ReaderSlice.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + /** * Subreader slice from a parent composite reader. diff --git a/lucene/core/src/java/org/apache/lucene/index/ReaderUtil.java b/lucene/core/src/java/org/apache/lucene/index/ReaderUtil.java index 1e8608ea408..32c7b3280c4 100644 --- a/lucene/core/src/java/org/apache/lucene/index/ReaderUtil.java +++ b/lucene/core/src/java/org/apache/lucene/index/ReaderUtil.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.util.List; diff --git a/lucene/core/src/java/org/apache/lucene/index/ReadersAndUpdates.java b/lucene/core/src/java/org/apache/lucene/index/ReadersAndUpdates.java index e258364a493..b9a71a3843d 100644 --- a/lucene/core/src/java/org/apache/lucene/index/ReadersAndUpdates.java +++ b/lucene/core/src/java/org/apache/lucene/index/ReadersAndUpdates.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.HashMap; diff --git a/lucene/core/src/java/org/apache/lucene/index/SegmentCommitInfo.java b/lucene/core/src/java/org/apache/lucene/index/SegmentCommitInfo.java index e3b483ea226..b1084a6b2df 100644 --- a/lucene/core/src/java/org/apache/lucene/index/SegmentCommitInfo.java +++ b/lucene/core/src/java/org/apache/lucene/index/SegmentCommitInfo.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.Collection; diff --git a/lucene/core/src/java/org/apache/lucene/index/SegmentCoreReaders.java b/lucene/core/src/java/org/apache/lucene/index/SegmentCoreReaders.java index b5d12219914..296fbbcf9aa 100644 --- a/lucene/core/src/java/org/apache/lucene/index/SegmentCoreReaders.java +++ b/lucene/core/src/java/org/apache/lucene/index/SegmentCoreReaders.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.Collections; diff --git a/lucene/core/src/java/org/apache/lucene/index/SegmentDocValues.java b/lucene/core/src/java/org/apache/lucene/index/SegmentDocValues.java index 093ef206a0d..ce2050f76de 100644 --- a/lucene/core/src/java/org/apache/lucene/index/SegmentDocValues.java +++ b/lucene/core/src/java/org/apache/lucene/index/SegmentDocValues.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.HashMap; diff --git a/lucene/core/src/java/org/apache/lucene/index/SegmentDocValuesProducer.java b/lucene/core/src/java/org/apache/lucene/index/SegmentDocValuesProducer.java index ee0f4eae023..e3662d52d82 100644 --- a/lucene/core/src/java/org/apache/lucene/index/SegmentDocValuesProducer.java +++ b/lucene/core/src/java/org/apache/lucene/index/SegmentDocValuesProducer.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java b/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java index 15a11b1b7db..bed84589576 100644 --- a/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java +++ b/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.util.Arrays; import java.util.Collection; diff --git a/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java b/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java index de5dbff1904..8d052e6e088 100644 --- a/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java +++ b/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.CodecUtil; diff --git a/lucene/core/src/java/org/apache/lucene/index/SegmentMerger.java b/lucene/core/src/java/org/apache/lucene/index/SegmentMerger.java index d80646f41a2..bb8e25686fa 100644 --- a/lucene/core/src/java/org/apache/lucene/index/SegmentMerger.java +++ b/lucene/core/src/java/org/apache/lucene/index/SegmentMerger.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.List; diff --git a/lucene/core/src/java/org/apache/lucene/index/SegmentReadState.java b/lucene/core/src/java/org/apache/lucene/index/SegmentReadState.java index b7eef06a747..73f50424f8f 100644 --- a/lucene/core/src/java/org/apache/lucene/index/SegmentReadState.java +++ b/lucene/core/src/java/org/apache/lucene/index/SegmentReadState.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.codecs.PostingsFormat; // javadocs import org.apache.lucene.codecs.perfield.PerFieldPostingsFormat; // javadocs diff --git a/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java b/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java index 20f87fd91f2..205017bc59f 100644 --- a/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java +++ b/lucene/core/src/java/org/apache/lucene/index/SegmentReader.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.Collections; diff --git a/lucene/core/src/java/org/apache/lucene/index/SegmentWriteState.java b/lucene/core/src/java/org/apache/lucene/index/SegmentWriteState.java index 23565fe9363..4cd020e84ab 100644 --- a/lucene/core/src/java/org/apache/lucene/index/SegmentWriteState.java +++ b/lucene/core/src/java/org/apache/lucene/index/SegmentWriteState.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.codecs.PostingsFormat; // javadocs import org.apache.lucene.codecs.perfield.PerFieldPostingsFormat; // javadocs diff --git a/lucene/core/src/java/org/apache/lucene/index/SerialMergeScheduler.java b/lucene/core/src/java/org/apache/lucene/index/SerialMergeScheduler.java index f8512727908..5a8f98b016b 100644 --- a/lucene/core/src/java/org/apache/lucene/index/SerialMergeScheduler.java +++ b/lucene/core/src/java/org/apache/lucene/index/SerialMergeScheduler.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/index/SimpleMergedSegmentWarmer.java b/lucene/core/src/java/org/apache/lucene/index/SimpleMergedSegmentWarmer.java index b4117a6b5bc..cf092ac57ed 100644 --- a/lucene/core/src/java/org/apache/lucene/index/SimpleMergedSegmentWarmer.java +++ b/lucene/core/src/java/org/apache/lucene/index/SimpleMergedSegmentWarmer.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/index/SingleTermsEnum.java b/lucene/core/src/java/org/apache/lucene/index/SingleTermsEnum.java index 20486417fc3..e6a77df7a3d 100644 --- a/lucene/core/src/java/org/apache/lucene/index/SingleTermsEnum.java +++ b/lucene/core/src/java/org/apache/lucene/index/SingleTermsEnum.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.search.MultiTermQuery; // javadocs import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/java/org/apache/lucene/index/SingletonSortedNumericDocValues.java b/lucene/core/src/java/org/apache/lucene/index/SingletonSortedNumericDocValues.java index b704df8e577..69f3714d24e 100644 --- a/lucene/core/src/java/org/apache/lucene/index/SingletonSortedNumericDocValues.java +++ b/lucene/core/src/java/org/apache/lucene/index/SingletonSortedNumericDocValues.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.util.Bits; import org.apache.lucene.util.Bits.MatchAllBits; diff --git a/lucene/core/src/java/org/apache/lucene/index/SingletonSortedSetDocValues.java b/lucene/core/src/java/org/apache/lucene/index/SingletonSortedSetDocValues.java index b11c53a7093..c90fcc5fafd 100644 --- a/lucene/core/src/java/org/apache/lucene/index/SingletonSortedSetDocValues.java +++ b/lucene/core/src/java/org/apache/lucene/index/SingletonSortedSetDocValues.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/java/org/apache/lucene/index/SlowCodecReaderWrapper.java b/lucene/core/src/java/org/apache/lucene/index/SlowCodecReaderWrapper.java index c925efb7688..50d9778ed8b 100644 --- a/lucene/core/src/java/org/apache/lucene/index/SlowCodecReaderWrapper.java +++ b/lucene/core/src/java/org/apache/lucene/index/SlowCodecReaderWrapper.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.Iterator; diff --git a/lucene/core/src/java/org/apache/lucene/index/SlowCompositeReaderWrapper.java b/lucene/core/src/java/org/apache/lucene/index/SlowCompositeReaderWrapper.java index 0f6cadf35e4..db9579cc13d 100644 --- a/lucene/core/src/java/org/apache/lucene/index/SlowCompositeReaderWrapper.java +++ b/lucene/core/src/java/org/apache/lucene/index/SlowCompositeReaderWrapper.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.HashMap; diff --git a/lucene/core/src/java/org/apache/lucene/index/SnapshotDeletionPolicy.java b/lucene/core/src/java/org/apache/lucene/index/SnapshotDeletionPolicy.java index ad4ed7d13b3..1ffbf6ec597 100644 --- a/lucene/core/src/java/org/apache/lucene/index/SnapshotDeletionPolicy.java +++ b/lucene/core/src/java/org/apache/lucene/index/SnapshotDeletionPolicy.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.util.Collection; import java.util.HashMap; diff --git a/lucene/core/src/java/org/apache/lucene/index/SortedDocValues.java b/lucene/core/src/java/org/apache/lucene/index/SortedDocValues.java index 774180d75bf..e9a55a36125 100644 --- a/lucene/core/src/java/org/apache/lucene/index/SortedDocValues.java +++ b/lucene/core/src/java/org/apache/lucene/index/SortedDocValues.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/java/org/apache/lucene/index/SortedDocValuesTermsEnum.java b/lucene/core/src/java/org/apache/lucene/index/SortedDocValuesTermsEnum.java index 48b57c06167..58247be13d1 100644 --- a/lucene/core/src/java/org/apache/lucene/index/SortedDocValuesTermsEnum.java +++ b/lucene/core/src/java/org/apache/lucene/index/SortedDocValuesTermsEnum.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/index/SortedDocValuesWriter.java b/lucene/core/src/java/org/apache/lucene/index/SortedDocValuesWriter.java index eb4c4320811..3231c607dd9 100644 --- a/lucene/core/src/java/org/apache/lucene/index/SortedDocValuesWriter.java +++ b/lucene/core/src/java/org/apache/lucene/index/SortedDocValuesWriter.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import static org.apache.lucene.util.ByteBlockPool.BYTE_BLOCK_SIZE; diff --git a/lucene/core/src/java/org/apache/lucene/index/SortedNumericDocValues.java b/lucene/core/src/java/org/apache/lucene/index/SortedNumericDocValues.java index da631fe7311..8b85a6cecc7 100644 --- a/lucene/core/src/java/org/apache/lucene/index/SortedNumericDocValues.java +++ b/lucene/core/src/java/org/apache/lucene/index/SortedNumericDocValues.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + /** * A list of per-document numeric values, sorted diff --git a/lucene/core/src/java/org/apache/lucene/index/SortedNumericDocValuesWriter.java b/lucene/core/src/java/org/apache/lucene/index/SortedNumericDocValuesWriter.java index 3481c17c467..5ce9a91bc70 100644 --- a/lucene/core/src/java/org/apache/lucene/index/SortedNumericDocValuesWriter.java +++ b/lucene/core/src/java/org/apache/lucene/index/SortedNumericDocValuesWriter.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/index/SortedSetDocValues.java b/lucene/core/src/java/org/apache/lucene/index/SortedSetDocValues.java index 51ec2ef1831..f68efcc3c8c 100644 --- a/lucene/core/src/java/org/apache/lucene/index/SortedSetDocValues.java +++ b/lucene/core/src/java/org/apache/lucene/index/SortedSetDocValues.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/java/org/apache/lucene/index/SortedSetDocValuesTermsEnum.java b/lucene/core/src/java/org/apache/lucene/index/SortedSetDocValuesTermsEnum.java index 5e1b4430727..d2b1b96dac8 100644 --- a/lucene/core/src/java/org/apache/lucene/index/SortedSetDocValuesTermsEnum.java +++ b/lucene/core/src/java/org/apache/lucene/index/SortedSetDocValuesTermsEnum.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; diff --git a/lucene/core/src/java/org/apache/lucene/index/SortedSetDocValuesWriter.java b/lucene/core/src/java/org/apache/lucene/index/SortedSetDocValuesWriter.java index d42141d66ea..52c6b5d858d 100644 --- a/lucene/core/src/java/org/apache/lucene/index/SortedSetDocValuesWriter.java +++ b/lucene/core/src/java/org/apache/lucene/index/SortedSetDocValuesWriter.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import static org.apache.lucene.util.ByteBlockPool.BYTE_BLOCK_SIZE; diff --git a/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java b/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java index 8d51532aa22..c5053a9dac2 100644 --- a/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.java +++ b/lucene/core/src/java/org/apache/lucene/index/StandardDirectoryReader.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/index/StoredFieldVisitor.java b/lucene/core/src/java/org/apache/lucene/index/StoredFieldVisitor.java index 3fea7ed188b..43782fe5af3 100644 --- a/lucene/core/src/java/org/apache/lucene/index/StoredFieldVisitor.java +++ b/lucene/core/src/java/org/apache/lucene/index/StoredFieldVisitor.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/index/Term.java b/lucene/core/src/java/org/apache/lucene/index/Term.java index 8e4ca42f7b4..feb31e080eb 100644 --- a/lucene/core/src/java/org/apache/lucene/index/Term.java +++ b/lucene/core/src/java/org/apache/lucene/index/Term.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.nio.ByteBuffer; import java.nio.charset.CharacterCodingException; diff --git a/lucene/core/src/java/org/apache/lucene/index/TermContext.java b/lucene/core/src/java/org/apache/lucene/index/TermContext.java index 67db9620b4b..ee5163eba6e 100644 --- a/lucene/core/src/java/org/apache/lucene/index/TermContext.java +++ b/lucene/core/src/java/org/apache/lucene/index/TermContext.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/java/org/apache/lucene/index/TermState.java b/lucene/core/src/java/org/apache/lucene/index/TermState.java index aa2f0ba9d57..d8e9be4c619 100644 --- a/lucene/core/src/java/org/apache/lucene/index/TermState.java +++ b/lucene/core/src/java/org/apache/lucene/index/TermState.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + /** * Encapsulates all required internal state to position the associated diff --git a/lucene/core/src/java/org/apache/lucene/index/TermVectorsConsumer.java b/lucene/core/src/java/org/apache/lucene/index/TermVectorsConsumer.java index 0ac2c88f3f2..da49a8bbe07 100644 --- a/lucene/core/src/java/org/apache/lucene/index/TermVectorsConsumer.java +++ b/lucene/core/src/java/org/apache/lucene/index/TermVectorsConsumer.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/index/TermVectorsConsumerPerField.java b/lucene/core/src/java/org/apache/lucene/index/TermVectorsConsumerPerField.java index f2117203053..f252147823c 100644 --- a/lucene/core/src/java/org/apache/lucene/index/TermVectorsConsumerPerField.java +++ b/lucene/core/src/java/org/apache/lucene/index/TermVectorsConsumerPerField.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/index/Terms.java b/lucene/core/src/java/org/apache/lucene/index/Terms.java index 5e1729481ff..dd48ce9c189 100644 --- a/lucene/core/src/java/org/apache/lucene/index/Terms.java +++ b/lucene/core/src/java/org/apache/lucene/index/Terms.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/index/TermsEnum.java b/lucene/core/src/java/org/apache/lucene/index/TermsEnum.java index 8397c43afbf..c4b1017b079 100644 --- a/lucene/core/src/java/org/apache/lucene/index/TermsEnum.java +++ b/lucene/core/src/java/org/apache/lucene/index/TermsEnum.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/index/TermsHash.java b/lucene/core/src/java/org/apache/lucene/index/TermsHash.java index 53f291c9571..fb5c78c0e6b 100644 --- a/lucene/core/src/java/org/apache/lucene/index/TermsHash.java +++ b/lucene/core/src/java/org/apache/lucene/index/TermsHash.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.HashMap; diff --git a/lucene/core/src/java/org/apache/lucene/index/TermsHashPerField.java b/lucene/core/src/java/org/apache/lucene/index/TermsHashPerField.java index 3ae00e697b7..3275a4e6811 100644 --- a/lucene/core/src/java/org/apache/lucene/index/TermsHashPerField.java +++ b/lucene/core/src/java/org/apache/lucene/index/TermsHashPerField.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java b/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java index d857c5e8e30..668f1ec8c1c 100644 --- a/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java +++ b/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/index/TrackingIndexWriter.java b/lucene/core/src/java/org/apache/lucene/index/TrackingIndexWriter.java index 7216e701d1f..67da49d9335 100644 --- a/lucene/core/src/java/org/apache/lucene/index/TrackingIndexWriter.java +++ b/lucene/core/src/java/org/apache/lucene/index/TrackingIndexWriter.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.concurrent.atomic.AtomicLong; diff --git a/lucene/core/src/java/org/apache/lucene/index/TwoPhaseCommit.java b/lucene/core/src/java/org/apache/lucene/index/TwoPhaseCommit.java index ff103b213f3..b574dbd4310 100644 --- a/lucene/core/src/java/org/apache/lucene/index/TwoPhaseCommit.java +++ b/lucene/core/src/java/org/apache/lucene/index/TwoPhaseCommit.java @@ -1,7 +1,3 @@ -package org.apache.lucene.index; - -import java.io.IOException; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,10 @@ import java.io.IOException; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + +import java.io.IOException; + /** * An interface for implementations that support 2-phase commit. You can use diff --git a/lucene/core/src/java/org/apache/lucene/index/TwoPhaseCommitTool.java b/lucene/core/src/java/org/apache/lucene/index/TwoPhaseCommitTool.java index ee8f8b25a85..89b6865ea3d 100644 --- a/lucene/core/src/java/org/apache/lucene/index/TwoPhaseCommitTool.java +++ b/lucene/core/src/java/org/apache/lucene/index/TwoPhaseCommitTool.java @@ -1,7 +1,3 @@ -package org.apache.lucene.index; - -import java.io.IOException; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,10 @@ import java.io.IOException; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + +import java.io.IOException; + /** * A utility for executing 2-phase commit on several objects. diff --git a/lucene/core/src/java/org/apache/lucene/index/UpgradeIndexMergePolicy.java b/lucene/core/src/java/org/apache/lucene/index/UpgradeIndexMergePolicy.java index ee11f516a49..74cbc905695 100644 --- a/lucene/core/src/java/org/apache/lucene/index/UpgradeIndexMergePolicy.java +++ b/lucene/core/src/java/org/apache/lucene/index/UpgradeIndexMergePolicy.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.util.Version; diff --git a/lucene/core/src/java/org/apache/lucene/index/package-info.java b/lucene/core/src/java/org/apache/lucene/index/package-info.java index f5a86d1cb37..787560c05b1 100644 --- a/lucene/core/src/java/org/apache/lucene/index/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/index/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Code to maintain and access indices. * diff --git a/lucene/core/src/java/org/apache/lucene/package-info.java b/lucene/core/src/java/org/apache/lucene/package-info.java index 0e6eedded81..70709d804fe 100644 --- a/lucene/core/src/java/org/apache/lucene/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/package-info.java @@ -13,8 +13,7 @@ * 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. - */ - + */ /** * Top-level package. */ diff --git a/lucene/core/src/java/org/apache/lucene/search/AutomatonQuery.java b/lucene/core/src/java/org/apache/lucene/search/AutomatonQuery.java index 35aecc0ef89..3b113a28a31 100644 --- a/lucene/core/src/java/org/apache/lucene/search/AutomatonQuery.java +++ b/lucene/core/src/java/org/apache/lucene/search/AutomatonQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/BlendedTermQuery.java b/lucene/core/src/java/org/apache/lucene/search/BlendedTermQuery.java index 5b6f520593a..c0ac6bbcab2 100644 --- a/lucene/core/src/java/org/apache/lucene/search/BlendedTermQuery.java +++ b/lucene/core/src/java/org/apache/lucene/search/BlendedTermQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/search/BooleanClause.java b/lucene/core/src/java/org/apache/lucene/search/BooleanClause.java index 12a5852e8d1..f3931b1f970 100644 --- a/lucene/core/src/java/org/apache/lucene/search/BooleanClause.java +++ b/lucene/core/src/java/org/apache/lucene/search/BooleanClause.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.util.Objects; diff --git a/lucene/core/src/java/org/apache/lucene/search/BooleanQuery.java b/lucene/core/src/java/org/apache/lucene/search/BooleanQuery.java index 8edc2532164..4699df4c3aa 100644 --- a/lucene/core/src/java/org/apache/lucene/search/BooleanQuery.java +++ b/lucene/core/src/java/org/apache/lucene/search/BooleanQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/search/BooleanScorer.java b/lucene/core/src/java/org/apache/lucene/search/BooleanScorer.java index 81561072ebd..4534bd465ab 100644 --- a/lucene/core/src/java/org/apache/lucene/search/BooleanScorer.java +++ b/lucene/core/src/java/org/apache/lucene/search/BooleanScorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/search/BooleanTopLevelScorers.java b/lucene/core/src/java/org/apache/lucene/search/BooleanTopLevelScorers.java index 80866e9d195..d34e7081e82 100644 --- a/lucene/core/src/java/org/apache/lucene/search/BooleanTopLevelScorers.java +++ b/lucene/core/src/java/org/apache/lucene/search/BooleanTopLevelScorers.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/search/BooleanWeight.java b/lucene/core/src/java/org/apache/lucene/search/BooleanWeight.java index 98abe9202fd..24cbac8f8c3 100644 --- a/lucene/core/src/java/org/apache/lucene/search/BooleanWeight.java +++ b/lucene/core/src/java/org/apache/lucene/search/BooleanWeight.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/search/BoostAttribute.java b/lucene/core/src/java/org/apache/lucene/search/BoostAttribute.java index 2a6ceced12b..2a99a0828ad 100644 --- a/lucene/core/src/java/org/apache/lucene/search/BoostAttribute.java +++ b/lucene/core/src/java/org/apache/lucene/search/BoostAttribute.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import org.apache.lucene.util.Attribute; import org.apache.lucene.util.AttributeSource; // javadocs only diff --git a/lucene/core/src/java/org/apache/lucene/search/BoostAttributeImpl.java b/lucene/core/src/java/org/apache/lucene/search/BoostAttributeImpl.java index 08a2e24dd12..9eced232785 100644 --- a/lucene/core/src/java/org/apache/lucene/search/BoostAttributeImpl.java +++ b/lucene/core/src/java/org/apache/lucene/search/BoostAttributeImpl.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import org.apache.lucene.util.AttributeImpl; import org.apache.lucene.util.AttributeReflector; diff --git a/lucene/core/src/java/org/apache/lucene/search/BoostQuery.java b/lucene/core/src/java/org/apache/lucene/search/BoostQuery.java index 1eadb708168..c7d0aea4079 100644 --- a/lucene/core/src/java/org/apache/lucene/search/BoostQuery.java +++ b/lucene/core/src/java/org/apache/lucene/search/BoostQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.Objects; diff --git a/lucene/core/src/java/org/apache/lucene/search/BulkScorer.java b/lucene/core/src/java/org/apache/lucene/search/BulkScorer.java index 2dba301d3ed..661c129d54a 100644 --- a/lucene/core/src/java/org/apache/lucene/search/BulkScorer.java +++ b/lucene/core/src/java/org/apache/lucene/search/BulkScorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/CachingCollector.java b/lucene/core/src/java/org/apache/lucene/search/CachingCollector.java index e411f6648a6..55fb30588a5 100644 --- a/lucene/core/src/java/org/apache/lucene/search/CachingCollector.java +++ b/lucene/core/src/java/org/apache/lucene/search/CachingCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/search/CollectionStatistics.java b/lucene/core/src/java/org/apache/lucene/search/CollectionStatistics.java index 0b2a3289925..e0aafa84ab2 100644 --- a/lucene/core/src/java/org/apache/lucene/search/CollectionStatistics.java +++ b/lucene/core/src/java/org/apache/lucene/search/CollectionStatistics.java @@ -1,8 +1,3 @@ -package org.apache.lucene.search; - -import org.apache.lucene.index.IndexReader; // javadocs -import org.apache.lucene.index.Terms; // javadocs - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -19,6 +14,11 @@ import org.apache.lucene.index.Terms; // javadocs * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + +import org.apache.lucene.index.IndexReader; // javadocs +import org.apache.lucene.index.Terms; // javadocs + /** * Contains statistics for a collection (field) diff --git a/lucene/core/src/java/org/apache/lucene/search/CollectionTerminatedException.java b/lucene/core/src/java/org/apache/lucene/search/CollectionTerminatedException.java index a4c426a9d51..e0a874ed9dc 100644 --- a/lucene/core/src/java/org/apache/lucene/search/CollectionTerminatedException.java +++ b/lucene/core/src/java/org/apache/lucene/search/CollectionTerminatedException.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + /** Throw this exception in {@link LeafCollector#collect(int)} to prematurely * terminate collection of the current leaf. diff --git a/lucene/core/src/java/org/apache/lucene/search/Collector.java b/lucene/core/src/java/org/apache/lucene/search/Collector.java index 664035345da..0e661661249 100644 --- a/lucene/core/src/java/org/apache/lucene/search/Collector.java +++ b/lucene/core/src/java/org/apache/lucene/search/Collector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/CollectorManager.java b/lucene/core/src/java/org/apache/lucene/search/CollectorManager.java index b0a90ad1eec..6a2e9a6ede5 100644 --- a/lucene/core/src/java/org/apache/lucene/search/CollectorManager.java +++ b/lucene/core/src/java/org/apache/lucene/search/CollectorManager.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.Collection; diff --git a/lucene/core/src/java/org/apache/lucene/search/ConjunctionDISI.java b/lucene/core/src/java/org/apache/lucene/search/ConjunctionDISI.java index 02936a8a8dd..53e3753436a 100644 --- a/lucene/core/src/java/org/apache/lucene/search/ConjunctionDISI.java +++ b/lucene/core/src/java/org/apache/lucene/search/ConjunctionDISI.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/search/ConjunctionScorer.java b/lucene/core/src/java/org/apache/lucene/search/ConjunctionScorer.java index 0419bb0b15e..066f07c9e99 100644 --- a/lucene/core/src/java/org/apache/lucene/search/ConjunctionScorer.java +++ b/lucene/core/src/java/org/apache/lucene/search/ConjunctionScorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java b/lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java index 3f6d51be0a0..4ca80e25947 100644 --- a/lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java +++ b/lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.Collection; diff --git a/lucene/core/src/java/org/apache/lucene/search/ConstantScoreScorer.java b/lucene/core/src/java/org/apache/lucene/search/ConstantScoreScorer.java index 1b06fccac91..be048e5890b 100644 --- a/lucene/core/src/java/org/apache/lucene/search/ConstantScoreScorer.java +++ b/lucene/core/src/java/org/apache/lucene/search/ConstantScoreScorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/ConstantScoreWeight.java b/lucene/core/src/java/org/apache/lucene/search/ConstantScoreWeight.java index 94f1c9d256d..034a3a770e1 100644 --- a/lucene/core/src/java/org/apache/lucene/search/ConstantScoreWeight.java +++ b/lucene/core/src/java/org/apache/lucene/search/ConstantScoreWeight.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.Set; diff --git a/lucene/core/src/java/org/apache/lucene/search/ControlledRealTimeReopenThread.java b/lucene/core/src/java/org/apache/lucene/search/ControlledRealTimeReopenThread.java index 7f944dacf2e..a2541cbee60 100644 --- a/lucene/core/src/java/org/apache/lucene/search/ControlledRealTimeReopenThread.java +++ b/lucene/core/src/java/org/apache/lucene/search/ControlledRealTimeReopenThread.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.Closeable; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/DisiPriorityQueue.java b/lucene/core/src/java/org/apache/lucene/search/DisiPriorityQueue.java index 57ff4c7d032..0692a7b914e 100644 --- a/lucene/core/src/java/org/apache/lucene/search/DisiPriorityQueue.java +++ b/lucene/core/src/java/org/apache/lucene/search/DisiPriorityQueue.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.util.Arrays; import java.util.Iterator; diff --git a/lucene/core/src/java/org/apache/lucene/search/DisiWrapper.java b/lucene/core/src/java/org/apache/lucene/search/DisiWrapper.java index b16a74eee62..f2543409f1d 100644 --- a/lucene/core/src/java/org/apache/lucene/search/DisiWrapper.java +++ b/lucene/core/src/java/org/apache/lucene/search/DisiWrapper.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import org.apache.lucene.search.spans.Spans; diff --git a/lucene/core/src/java/org/apache/lucene/search/DisjunctionDISIApproximation.java b/lucene/core/src/java/org/apache/lucene/search/DisjunctionDISIApproximation.java index 179eaf44c10..395c1521418 100644 --- a/lucene/core/src/java/org/apache/lucene/search/DisjunctionDISIApproximation.java +++ b/lucene/core/src/java/org/apache/lucene/search/DisjunctionDISIApproximation.java @@ -1,4 +1,3 @@ -package org.apache.lucene.search; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java b/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java index 1b1d0b00b8d..9bcd05fa736 100644 --- a/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java +++ b/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxQuery.java @@ -1,11 +1,10 @@ -package org.apache.lucene.search; - /* - * Copyright 2004 The Apache Software Foundation - * - * Licensed 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 + * 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 * @@ -15,6 +14,7 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxScorer.java b/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxScorer.java index 58a9dc9934c..3d6fbdaf1bf 100644 --- a/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxScorer.java +++ b/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxScorer.java @@ -1,11 +1,10 @@ -package org.apache.lucene.search; - /* - * Copyright 2004 The Apache Software Foundation - * - * Licensed 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 + * 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 * @@ -15,6 +14,7 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import java.io.IOException; import java.util.List; diff --git a/lucene/core/src/java/org/apache/lucene/search/DisjunctionScorer.java b/lucene/core/src/java/org/apache/lucene/search/DisjunctionScorer.java index bb0241adbf3..c53942a71c1 100644 --- a/lucene/core/src/java/org/apache/lucene/search/DisjunctionScorer.java +++ b/lucene/core/src/java/org/apache/lucene/search/DisjunctionScorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/search/DisjunctionSumScorer.java b/lucene/core/src/java/org/apache/lucene/search/DisjunctionSumScorer.java index 133810e57ae..5bf33a279ba 100644 --- a/lucene/core/src/java/org/apache/lucene/search/DisjunctionSumScorer.java +++ b/lucene/core/src/java/org/apache/lucene/search/DisjunctionSumScorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.List; diff --git a/lucene/core/src/java/org/apache/lucene/search/DocIdSet.java b/lucene/core/src/java/org/apache/lucene/search/DocIdSet.java index 716cc7a8283..05870d9eda3 100644 --- a/lucene/core/src/java/org/apache/lucene/search/DocIdSet.java +++ b/lucene/core/src/java/org/apache/lucene/search/DocIdSet.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/DocIdSetIterator.java b/lucene/core/src/java/org/apache/lucene/search/DocIdSetIterator.java index 697860ade66..70d320adea1 100644 --- a/lucene/core/src/java/org/apache/lucene/search/DocIdSetIterator.java +++ b/lucene/core/src/java/org/apache/lucene/search/DocIdSetIterator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/DocValuesDocIdSet.java b/lucene/core/src/java/org/apache/lucene/search/DocValuesDocIdSet.java index 815cba38e13..22c090c4783 100644 --- a/lucene/core/src/java/org/apache/lucene/search/DocValuesDocIdSet.java +++ b/lucene/core/src/java/org/apache/lucene/search/DocValuesDocIdSet.java @@ -1,4 +1,3 @@ -package org.apache.lucene.search; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/DocValuesRewriteMethod.java b/lucene/core/src/java/org/apache/lucene/search/DocValuesRewriteMethod.java index 62f016b8015..0c544e3120d 100644 --- a/lucene/core/src/java/org/apache/lucene/search/DocValuesRewriteMethod.java +++ b/lucene/core/src/java/org/apache/lucene/search/DocValuesRewriteMethod.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/ExactPhraseScorer.java b/lucene/core/src/java/org/apache/lucene/search/ExactPhraseScorer.java index 9be6043a796..c3c8b713c35 100644 --- a/lucene/core/src/java/org/apache/lucene/search/ExactPhraseScorer.java +++ b/lucene/core/src/java/org/apache/lucene/search/ExactPhraseScorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/search/ExactPointQuery.java b/lucene/core/src/java/org/apache/lucene/search/ExactPointQuery.java index 21d7357e5ea..5bcf11398a3 100644 --- a/lucene/core/src/java/org/apache/lucene/search/ExactPointQuery.java +++ b/lucene/core/src/java/org/apache/lucene/search/ExactPointQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/search/Explanation.java b/lucene/core/src/java/org/apache/lucene/search/Explanation.java index 9f767ca4277..70bf8bc3271 100644 --- a/lucene/core/src/java/org/apache/lucene/search/Explanation.java +++ b/lucene/core/src/java/org/apache/lucene/search/Explanation.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.util.ArrayList; import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/search/FakeScorer.java b/lucene/core/src/java/org/apache/lucene/search/FakeScorer.java index ade942c99d3..32fb40551c2 100644 --- a/lucene/core/src/java/org/apache/lucene/search/FakeScorer.java +++ b/lucene/core/src/java/org/apache/lucene/search/FakeScorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.util.Collection; diff --git a/lucene/core/src/java/org/apache/lucene/search/FieldComparator.java b/lucene/core/src/java/org/apache/lucene/search/FieldComparator.java index 8d23b0230c5..735dfbeaaf2 100644 --- a/lucene/core/src/java/org/apache/lucene/search/FieldComparator.java +++ b/lucene/core/src/java/org/apache/lucene/search/FieldComparator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/FieldComparatorSource.java b/lucene/core/src/java/org/apache/lucene/search/FieldComparatorSource.java index b612ab5915a..295ec9cb220 100644 --- a/lucene/core/src/java/org/apache/lucene/search/FieldComparatorSource.java +++ b/lucene/core/src/java/org/apache/lucene/search/FieldComparatorSource.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/FieldDoc.java b/lucene/core/src/java/org/apache/lucene/search/FieldDoc.java index 64c8af9dab5..31f71755be1 100644 --- a/lucene/core/src/java/org/apache/lucene/search/FieldDoc.java +++ b/lucene/core/src/java/org/apache/lucene/search/FieldDoc.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/search/FieldValueHitQueue.java b/lucene/core/src/java/org/apache/lucene/search/FieldValueHitQueue.java index c464f23509b..c53774c00b7 100644 --- a/lucene/core/src/java/org/apache/lucene/search/FieldValueHitQueue.java +++ b/lucene/core/src/java/org/apache/lucene/search/FieldValueHitQueue.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/FieldValueQuery.java b/lucene/core/src/java/org/apache/lucene/search/FieldValueQuery.java index aa21a8f14c4..e73b8971d42 100644 --- a/lucene/core/src/java/org/apache/lucene/search/FieldValueQuery.java +++ b/lucene/core/src/java/org/apache/lucene/search/FieldValueQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.Objects; diff --git a/lucene/core/src/java/org/apache/lucene/search/FilterCollector.java b/lucene/core/src/java/org/apache/lucene/search/FilterCollector.java index aa9655a2cf9..d290330f5d6 100644 --- a/lucene/core/src/java/org/apache/lucene/search/FilterCollector.java +++ b/lucene/core/src/java/org/apache/lucene/search/FilterCollector.java @@ -1,9 +1,3 @@ -package org.apache.lucene.search; - -import java.io.IOException; - -import org.apache.lucene.index.LeafReaderContext; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -20,6 +14,12 @@ import org.apache.lucene.index.LeafReaderContext; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + +import java.io.IOException; + +import org.apache.lucene.index.LeafReaderContext; + /** * {@link Collector} delegator. diff --git a/lucene/core/src/java/org/apache/lucene/search/FilterLeafCollector.java b/lucene/core/src/java/org/apache/lucene/search/FilterLeafCollector.java index 5d796633acb..ab15babad0b 100644 --- a/lucene/core/src/java/org/apache/lucene/search/FilterLeafCollector.java +++ b/lucene/core/src/java/org/apache/lucene/search/FilterLeafCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/FilterScorer.java b/lucene/core/src/java/org/apache/lucene/search/FilterScorer.java index 7e3aed96bcc..421100ccf70 100644 --- a/lucene/core/src/java/org/apache/lucene/search/FilterScorer.java +++ b/lucene/core/src/java/org/apache/lucene/search/FilterScorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/FilteredDocIdSetIterator.java b/lucene/core/src/java/org/apache/lucene/search/FilteredDocIdSetIterator.java index 016788fdd35..bd88a080de6 100644 --- a/lucene/core/src/java/org/apache/lucene/search/FilteredDocIdSetIterator.java +++ b/lucene/core/src/java/org/apache/lucene/search/FilteredDocIdSetIterator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/FuzzyQuery.java b/lucene/core/src/java/org/apache/lucene/search/FuzzyQuery.java index 57bb4645764..8e0cfff612a 100644 --- a/lucene/core/src/java/org/apache/lucene/search/FuzzyQuery.java +++ b/lucene/core/src/java/org/apache/lucene/search/FuzzyQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/FuzzyTermsEnum.java b/lucene/core/src/java/org/apache/lucene/search/FuzzyTermsEnum.java index 5e453fc0ff9..f934d805e72 100644 --- a/lucene/core/src/java/org/apache/lucene/search/FuzzyTermsEnum.java +++ b/lucene/core/src/java/org/apache/lucene/search/FuzzyTermsEnum.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/search/HitQueue.java b/lucene/core/src/java/org/apache/lucene/search/HitQueue.java index bec8e0fc971..8868c2b0829 100644 --- a/lucene/core/src/java/org/apache/lucene/search/HitQueue.java +++ b/lucene/core/src/java/org/apache/lucene/search/HitQueue.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import org.apache.lucene.util.PriorityQueue; diff --git a/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java b/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java index 57bb22a80f1..3ac64c84c5d 100644 --- a/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java +++ b/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/search/LRUQueryCache.java b/lucene/core/src/java/org/apache/lucene/search/LRUQueryCache.java index 2633852ff3a..6c065ae5010 100644 --- a/lucene/core/src/java/org/apache/lucene/search/LRUQueryCache.java +++ b/lucene/core/src/java/org/apache/lucene/search/LRUQueryCache.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/search/LeafCollector.java b/lucene/core/src/java/org/apache/lucene/search/LeafCollector.java index 75cc4cd45b1..9704026053a 100644 --- a/lucene/core/src/java/org/apache/lucene/search/LeafCollector.java +++ b/lucene/core/src/java/org/apache/lucene/search/LeafCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/LeafFieldComparator.java b/lucene/core/src/java/org/apache/lucene/search/LeafFieldComparator.java index 3d1e43e88bf..bbf1de88abd 100644 --- a/lucene/core/src/java/org/apache/lucene/search/LeafFieldComparator.java +++ b/lucene/core/src/java/org/apache/lucene/search/LeafFieldComparator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/LegacyNumericRangeQuery.java b/lucene/core/src/java/org/apache/lucene/search/LegacyNumericRangeQuery.java index cebfd14e482..9b478456df4 100644 --- a/lucene/core/src/java/org/apache/lucene/search/LegacyNumericRangeQuery.java +++ b/lucene/core/src/java/org/apache/lucene/search/LegacyNumericRangeQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.LinkedList; diff --git a/lucene/core/src/java/org/apache/lucene/search/LiveFieldValues.java b/lucene/core/src/java/org/apache/lucene/search/LiveFieldValues.java index 16cfb66ba68..58939c112fa 100644 --- a/lucene/core/src/java/org/apache/lucene/search/LiveFieldValues.java +++ b/lucene/core/src/java/org/apache/lucene/search/LiveFieldValues.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.Closeable; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/MatchAllDocsQuery.java b/lucene/core/src/java/org/apache/lucene/search/MatchAllDocsQuery.java index e2bbfe752b8..4f62f74af20 100644 --- a/lucene/core/src/java/org/apache/lucene/search/MatchAllDocsQuery.java +++ b/lucene/core/src/java/org/apache/lucene/search/MatchAllDocsQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/MatchNoDocsQuery.java b/lucene/core/src/java/org/apache/lucene/search/MatchNoDocsQuery.java index 000552a7d06..d0bc18c2fbc 100644 --- a/lucene/core/src/java/org/apache/lucene/search/MatchNoDocsQuery.java +++ b/lucene/core/src/java/org/apache/lucene/search/MatchNoDocsQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/MaxNonCompetitiveBoostAttribute.java b/lucene/core/src/java/org/apache/lucene/search/MaxNonCompetitiveBoostAttribute.java index 34e431e8f0a..59670b4885e 100644 --- a/lucene/core/src/java/org/apache/lucene/search/MaxNonCompetitiveBoostAttribute.java +++ b/lucene/core/src/java/org/apache/lucene/search/MaxNonCompetitiveBoostAttribute.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import org.apache.lucene.util.Attribute; import org.apache.lucene.util.AttributeSource; // javadocs only diff --git a/lucene/core/src/java/org/apache/lucene/search/MaxNonCompetitiveBoostAttributeImpl.java b/lucene/core/src/java/org/apache/lucene/search/MaxNonCompetitiveBoostAttributeImpl.java index efd85db7900..8a286417cbf 100644 --- a/lucene/core/src/java/org/apache/lucene/search/MaxNonCompetitiveBoostAttributeImpl.java +++ b/lucene/core/src/java/org/apache/lucene/search/MaxNonCompetitiveBoostAttributeImpl.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import org.apache.lucene.util.AttributeImpl; import org.apache.lucene.util.AttributeReflector; diff --git a/lucene/core/src/java/org/apache/lucene/search/MinShouldMatchSumScorer.java b/lucene/core/src/java/org/apache/lucene/search/MinShouldMatchSumScorer.java index 930c924cc91..9653d95e719 100644 --- a/lucene/core/src/java/org/apache/lucene/search/MinShouldMatchSumScorer.java +++ b/lucene/core/src/java/org/apache/lucene/search/MinShouldMatchSumScorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/search/MultiCollector.java b/lucene/core/src/java/org/apache/lucene/search/MultiCollector.java index 36202e5a33d..71a2be27244 100644 --- a/lucene/core/src/java/org/apache/lucene/search/MultiCollector.java +++ b/lucene/core/src/java/org/apache/lucene/search/MultiCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java b/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java index 7595710d2bd..b665388c68c 100644 --- a/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java +++ b/lucene/core/src/java/org/apache/lucene/search/MultiPhraseQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.*; diff --git a/lucene/core/src/java/org/apache/lucene/search/MultiTermQuery.java b/lucene/core/src/java/org/apache/lucene/search/MultiTermQuery.java index 79204b787c1..6b5c65f14f8 100644 --- a/lucene/core/src/java/org/apache/lucene/search/MultiTermQuery.java +++ b/lucene/core/src/java/org/apache/lucene/search/MultiTermQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.Objects; diff --git a/lucene/core/src/java/org/apache/lucene/search/MultiTermQueryConstantScoreWrapper.java b/lucene/core/src/java/org/apache/lucene/search/MultiTermQueryConstantScoreWrapper.java index 5e0f371cf75..410386b92cf 100644 --- a/lucene/core/src/java/org/apache/lucene/search/MultiTermQueryConstantScoreWrapper.java +++ b/lucene/core/src/java/org/apache/lucene/search/MultiTermQueryConstantScoreWrapper.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/search/Multiset.java b/lucene/core/src/java/org/apache/lucene/search/Multiset.java index 5fbb3b38486..0755eddd4a1 100644 --- a/lucene/core/src/java/org/apache/lucene/search/Multiset.java +++ b/lucene/core/src/java/org/apache/lucene/search/Multiset.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.util.AbstractCollection; import java.util.Collection; diff --git a/lucene/core/src/java/org/apache/lucene/search/NGramPhraseQuery.java b/lucene/core/src/java/org/apache/lucene/search/NGramPhraseQuery.java index 7af2d5375d5..1b49e8f0f26 100644 --- a/lucene/core/src/java/org/apache/lucene/search/NGramPhraseQuery.java +++ b/lucene/core/src/java/org/apache/lucene/search/NGramPhraseQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.Objects; diff --git a/lucene/core/src/java/org/apache/lucene/search/PhrasePositions.java b/lucene/core/src/java/org/apache/lucene/search/PhrasePositions.java index 198583c3532..640cd5f20e4 100644 --- a/lucene/core/src/java/org/apache/lucene/search/PhrasePositions.java +++ b/lucene/core/src/java/org/apache/lucene/search/PhrasePositions.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import org.apache.lucene.index.*; diff --git a/lucene/core/src/java/org/apache/lucene/search/PhraseQuery.java b/lucene/core/src/java/org/apache/lucene/search/PhraseQuery.java index 7ebb609eb01..143ed176e12 100644 --- a/lucene/core/src/java/org/apache/lucene/search/PhraseQuery.java +++ b/lucene/core/src/java/org/apache/lucene/search/PhraseQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/search/PhraseQueue.java b/lucene/core/src/java/org/apache/lucene/search/PhraseQueue.java index 1707f1530cd..636b4cc7f5b 100644 --- a/lucene/core/src/java/org/apache/lucene/search/PhraseQueue.java +++ b/lucene/core/src/java/org/apache/lucene/search/PhraseQueue.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import org.apache.lucene.util.PriorityQueue; diff --git a/lucene/core/src/java/org/apache/lucene/search/PointRangeQuery.java b/lucene/core/src/java/org/apache/lucene/search/PointRangeQuery.java index 714ba0dfd38..58f6d071878 100644 --- a/lucene/core/src/java/org/apache/lucene/search/PointRangeQuery.java +++ b/lucene/core/src/java/org/apache/lucene/search/PointRangeQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/search/PositiveScoresOnlyCollector.java b/lucene/core/src/java/org/apache/lucene/search/PositiveScoresOnlyCollector.java index 75840d44a4e..e5294db77ca 100644 --- a/lucene/core/src/java/org/apache/lucene/search/PositiveScoresOnlyCollector.java +++ b/lucene/core/src/java/org/apache/lucene/search/PositiveScoresOnlyCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/PrefixQuery.java b/lucene/core/src/java/org/apache/lucene/search/PrefixQuery.java index f618e29210e..207a1434488 100644 --- a/lucene/core/src/java/org/apache/lucene/search/PrefixQuery.java +++ b/lucene/core/src/java/org/apache/lucene/search/PrefixQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import org.apache.lucene.index.Term; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/java/org/apache/lucene/search/Query.java b/lucene/core/src/java/org/apache/lucene/search/Query.java index 9646ff746ee..49134ec38af 100644 --- a/lucene/core/src/java/org/apache/lucene/search/Query.java +++ b/lucene/core/src/java/org/apache/lucene/search/Query.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/QueryCache.java b/lucene/core/src/java/org/apache/lucene/search/QueryCache.java index 64461565991..25412b91744 100644 --- a/lucene/core/src/java/org/apache/lucene/search/QueryCache.java +++ b/lucene/core/src/java/org/apache/lucene/search/QueryCache.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + /** * A cache for queries. diff --git a/lucene/core/src/java/org/apache/lucene/search/QueryCachingPolicy.java b/lucene/core/src/java/org/apache/lucene/search/QueryCachingPolicy.java index f9118aaf97f..d62779e0d5f 100644 --- a/lucene/core/src/java/org/apache/lucene/search/QueryCachingPolicy.java +++ b/lucene/core/src/java/org/apache/lucene/search/QueryCachingPolicy.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/QueryRescorer.java b/lucene/core/src/java/org/apache/lucene/search/QueryRescorer.java index 539b591f47a..a8477e9b0e6 100644 --- a/lucene/core/src/java/org/apache/lucene/search/QueryRescorer.java +++ b/lucene/core/src/java/org/apache/lucene/search/QueryRescorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/search/RandomAccessWeight.java b/lucene/core/src/java/org/apache/lucene/search/RandomAccessWeight.java index 2d25e296a46..fcc1d1a2f76 100644 --- a/lucene/core/src/java/org/apache/lucene/search/RandomAccessWeight.java +++ b/lucene/core/src/java/org/apache/lucene/search/RandomAccessWeight.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/ReferenceManager.java b/lucene/core/src/java/org/apache/lucene/search/ReferenceManager.java index 2abb23e38a0..6ecf81bd944 100644 --- a/lucene/core/src/java/org/apache/lucene/search/ReferenceManager.java +++ b/lucene/core/src/java/org/apache/lucene/search/ReferenceManager.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.Closeable; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/RegexpQuery.java b/lucene/core/src/java/org/apache/lucene/search/RegexpQuery.java index afb7c04c521..39d56dcee4a 100644 --- a/lucene/core/src/java/org/apache/lucene/search/RegexpQuery.java +++ b/lucene/core/src/java/org/apache/lucene/search/RegexpQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import org.apache.lucene.index.Term; import org.apache.lucene.util.ToStringUtils; diff --git a/lucene/core/src/java/org/apache/lucene/search/ReqExclBulkScorer.java b/lucene/core/src/java/org/apache/lucene/search/ReqExclBulkScorer.java index aaf34d8d50d..6ad8be1dbc0 100644 --- a/lucene/core/src/java/org/apache/lucene/search/ReqExclBulkScorer.java +++ b/lucene/core/src/java/org/apache/lucene/search/ReqExclBulkScorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/ReqExclScorer.java b/lucene/core/src/java/org/apache/lucene/search/ReqExclScorer.java index d585cbb6e5e..5ce6f5edee7 100644 --- a/lucene/core/src/java/org/apache/lucene/search/ReqExclScorer.java +++ b/lucene/core/src/java/org/apache/lucene/search/ReqExclScorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.Collection; diff --git a/lucene/core/src/java/org/apache/lucene/search/ReqOptSumScorer.java b/lucene/core/src/java/org/apache/lucene/search/ReqOptSumScorer.java index 292066bb3b4..be22a6d114d 100644 --- a/lucene/core/src/java/org/apache/lucene/search/ReqOptSumScorer.java +++ b/lucene/core/src/java/org/apache/lucene/search/ReqOptSumScorer.java @@ -1,4 +1,3 @@ -package org.apache.lucene.search; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/search/Rescorer.java b/lucene/core/src/java/org/apache/lucene/search/Rescorer.java index f3e19c9a7dd..01e322ab7e6 100644 --- a/lucene/core/src/java/org/apache/lucene/search/Rescorer.java +++ b/lucene/core/src/java/org/apache/lucene/search/Rescorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/ScoreCachingWrappingScorer.java b/lucene/core/src/java/org/apache/lucene/search/ScoreCachingWrappingScorer.java index 2ffe3d59639..9a99d891e76 100644 --- a/lucene/core/src/java/org/apache/lucene/search/ScoreCachingWrappingScorer.java +++ b/lucene/core/src/java/org/apache/lucene/search/ScoreCachingWrappingScorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.Collection; diff --git a/lucene/core/src/java/org/apache/lucene/search/ScoreDoc.java b/lucene/core/src/java/org/apache/lucene/search/ScoreDoc.java index 512a1d48d9f..69464cfdcdc 100644 --- a/lucene/core/src/java/org/apache/lucene/search/ScoreDoc.java +++ b/lucene/core/src/java/org/apache/lucene/search/ScoreDoc.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + /** Holds one hit in {@link TopDocs}. */ diff --git a/lucene/core/src/java/org/apache/lucene/search/Scorer.java b/lucene/core/src/java/org/apache/lucene/search/Scorer.java index 84ce3e34754..f43432777fe 100644 --- a/lucene/core/src/java/org/apache/lucene/search/Scorer.java +++ b/lucene/core/src/java/org/apache/lucene/search/Scorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.Collection; diff --git a/lucene/core/src/java/org/apache/lucene/search/ScoringRewrite.java b/lucene/core/src/java/org/apache/lucene/search/ScoringRewrite.java index d987d64b7f2..f472f5c7030 100644 --- a/lucene/core/src/java/org/apache/lucene/search/ScoringRewrite.java +++ b/lucene/core/src/java/org/apache/lucene/search/ScoringRewrite.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/SearcherFactory.java b/lucene/core/src/java/org/apache/lucene/search/SearcherFactory.java index dbdade9b30d..eeb817e3718 100644 --- a/lucene/core/src/java/org/apache/lucene/search/SearcherFactory.java +++ b/lucene/core/src/java/org/apache/lucene/search/SearcherFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.concurrent.ExecutorService; // javadocs diff --git a/lucene/core/src/java/org/apache/lucene/search/SearcherLifetimeManager.java b/lucene/core/src/java/org/apache/lucene/search/SearcherLifetimeManager.java index 8a81156758f..0146674eb30 100644 --- a/lucene/core/src/java/org/apache/lucene/search/SearcherLifetimeManager.java +++ b/lucene/core/src/java/org/apache/lucene/search/SearcherLifetimeManager.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.Closeable; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/SearcherManager.java b/lucene/core/src/java/org/apache/lucene/search/SearcherManager.java index 3d3b0648eaa..80dcacfb26c 100644 --- a/lucene/core/src/java/org/apache/lucene/search/SearcherManager.java +++ b/lucene/core/src/java/org/apache/lucene/search/SearcherManager.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/SimpleCollector.java b/lucene/core/src/java/org/apache/lucene/search/SimpleCollector.java index dbe90a78abb..b299f522263 100644 --- a/lucene/core/src/java/org/apache/lucene/search/SimpleCollector.java +++ b/lucene/core/src/java/org/apache/lucene/search/SimpleCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/SimpleFieldComparator.java b/lucene/core/src/java/org/apache/lucene/search/SimpleFieldComparator.java index eb304c19657..3f1e6c2a7a1 100644 --- a/lucene/core/src/java/org/apache/lucene/search/SimpleFieldComparator.java +++ b/lucene/core/src/java/org/apache/lucene/search/SimpleFieldComparator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/SloppyPhraseScorer.java b/lucene/core/src/java/org/apache/lucene/search/SloppyPhraseScorer.java index 73df12d8cd5..2ee3e70d21c 100644 --- a/lucene/core/src/java/org/apache/lucene/search/SloppyPhraseScorer.java +++ b/lucene/core/src/java/org/apache/lucene/search/SloppyPhraseScorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/search/Sort.java b/lucene/core/src/java/org/apache/lucene/search/Sort.java index 4340cec0f01..7493e9b6a89 100644 --- a/lucene/core/src/java/org/apache/lucene/search/Sort.java +++ b/lucene/core/src/java/org/apache/lucene/search/Sort.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/search/SortField.java b/lucene/core/src/java/org/apache/lucene/search/SortField.java index 8b2c0e55a9b..3c5974f6e34 100644 --- a/lucene/core/src/java/org/apache/lucene/search/SortField.java +++ b/lucene/core/src/java/org/apache/lucene/search/SortField.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.Comparator; diff --git a/lucene/core/src/java/org/apache/lucene/search/SortRescorer.java b/lucene/core/src/java/org/apache/lucene/search/SortRescorer.java index 2a0d27ef04e..f051d382b01 100644 --- a/lucene/core/src/java/org/apache/lucene/search/SortRescorer.java +++ b/lucene/core/src/java/org/apache/lucene/search/SortRescorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/search/SortedNumericSelector.java b/lucene/core/src/java/org/apache/lucene/search/SortedNumericSelector.java index b2bc0cdce01..bdf67ccaa11 100644 --- a/lucene/core/src/java/org/apache/lucene/search/SortedNumericSelector.java +++ b/lucene/core/src/java/org/apache/lucene/search/SortedNumericSelector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import org.apache.lucene.index.DocValues; import org.apache.lucene.index.NumericDocValues; diff --git a/lucene/core/src/java/org/apache/lucene/search/SortedNumericSortField.java b/lucene/core/src/java/org/apache/lucene/search/SortedNumericSortField.java index 95317063412..188a4086ff5 100644 --- a/lucene/core/src/java/org/apache/lucene/search/SortedNumericSortField.java +++ b/lucene/core/src/java/org/apache/lucene/search/SortedNumericSortField.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/SortedSetSelector.java b/lucene/core/src/java/org/apache/lucene/search/SortedSetSelector.java index 0e356d41b08..dee5e26eee2 100644 --- a/lucene/core/src/java/org/apache/lucene/search/SortedSetSelector.java +++ b/lucene/core/src/java/org/apache/lucene/search/SortedSetSelector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import org.apache.lucene.index.DocValues; import org.apache.lucene.index.RandomAccessOrds; diff --git a/lucene/core/src/java/org/apache/lucene/search/SortedSetSortField.java b/lucene/core/src/java/org/apache/lucene/search/SortedSetSortField.java index d2048193d18..5f81e856dd0 100644 --- a/lucene/core/src/java/org/apache/lucene/search/SortedSetSortField.java +++ b/lucene/core/src/java/org/apache/lucene/search/SortedSetSortField.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/SynonymQuery.java b/lucene/core/src/java/org/apache/lucene/search/SynonymQuery.java index 502102ac294..6bca14babf6 100644 --- a/lucene/core/src/java/org/apache/lucene/search/SynonymQuery.java +++ b/lucene/core/src/java/org/apache/lucene/search/SynonymQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/search/TermCollectingRewrite.java b/lucene/core/src/java/org/apache/lucene/search/TermCollectingRewrite.java index 8a96965b438..fffa5a84fca 100644 --- a/lucene/core/src/java/org/apache/lucene/search/TermCollectingRewrite.java +++ b/lucene/core/src/java/org/apache/lucene/search/TermCollectingRewrite.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/TermQuery.java b/lucene/core/src/java/org/apache/lucene/search/TermQuery.java index aa9f20f0bba..b7b6d290722 100644 --- a/lucene/core/src/java/org/apache/lucene/search/TermQuery.java +++ b/lucene/core/src/java/org/apache/lucene/search/TermQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.Objects; diff --git a/lucene/core/src/java/org/apache/lucene/search/TermRangeQuery.java b/lucene/core/src/java/org/apache/lucene/search/TermRangeQuery.java index b61a2348f20..cd73902c8b5 100644 --- a/lucene/core/src/java/org/apache/lucene/search/TermRangeQuery.java +++ b/lucene/core/src/java/org/apache/lucene/search/TermRangeQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import org.apache.lucene.index.Term; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/java/org/apache/lucene/search/TermScorer.java b/lucene/core/src/java/org/apache/lucene/search/TermScorer.java index 72964c90e31..6c823f1196c 100644 --- a/lucene/core/src/java/org/apache/lucene/search/TermScorer.java +++ b/lucene/core/src/java/org/apache/lucene/search/TermScorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/TermStatistics.java b/lucene/core/src/java/org/apache/lucene/search/TermStatistics.java index 13480ab6462..c00774ba9c7 100644 --- a/lucene/core/src/java/org/apache/lucene/search/TermStatistics.java +++ b/lucene/core/src/java/org/apache/lucene/search/TermStatistics.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import org.apache.lucene.index.TermsEnum; // javadocs import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/java/org/apache/lucene/search/TimeLimitingCollector.java b/lucene/core/src/java/org/apache/lucene/search/TimeLimitingCollector.java index b2139ed032b..4708b20b025 100644 --- a/lucene/core/src/java/org/apache/lucene/search/TimeLimitingCollector.java +++ b/lucene/core/src/java/org/apache/lucene/search/TimeLimitingCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/TopDocs.java b/lucene/core/src/java/org/apache/lucene/search/TopDocs.java index 48bdcdd6779..69fa3c63af6 100644 --- a/lucene/core/src/java/org/apache/lucene/search/TopDocs.java +++ b/lucene/core/src/java/org/apache/lucene/search/TopDocs.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import org.apache.lucene.util.PriorityQueue; diff --git a/lucene/core/src/java/org/apache/lucene/search/TopDocsCollector.java b/lucene/core/src/java/org/apache/lucene/search/TopDocsCollector.java index d9da8aef762..86bf17e07c9 100644 --- a/lucene/core/src/java/org/apache/lucene/search/TopDocsCollector.java +++ b/lucene/core/src/java/org/apache/lucene/search/TopDocsCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import org.apache.lucene.util.PriorityQueue; diff --git a/lucene/core/src/java/org/apache/lucene/search/TopFieldCollector.java b/lucene/core/src/java/org/apache/lucene/search/TopFieldCollector.java index 4139346f3d3..7ecb9f63536 100644 --- a/lucene/core/src/java/org/apache/lucene/search/TopFieldCollector.java +++ b/lucene/core/src/java/org/apache/lucene/search/TopFieldCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/TopFieldDocs.java b/lucene/core/src/java/org/apache/lucene/search/TopFieldDocs.java index 59cfc71b1b1..af187f375dc 100644 --- a/lucene/core/src/java/org/apache/lucene/search/TopFieldDocs.java +++ b/lucene/core/src/java/org/apache/lucene/search/TopFieldDocs.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + /** Represents hits returned by {@link diff --git a/lucene/core/src/java/org/apache/lucene/search/TopScoreDocCollector.java b/lucene/core/src/java/org/apache/lucene/search/TopScoreDocCollector.java index f643727a5ce..a840b821fae 100644 --- a/lucene/core/src/java/org/apache/lucene/search/TopScoreDocCollector.java +++ b/lucene/core/src/java/org/apache/lucene/search/TopScoreDocCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/TopTermsRewrite.java b/lucene/core/src/java/org/apache/lucene/search/TopTermsRewrite.java index 000b893e37d..013171d5a72 100644 --- a/lucene/core/src/java/org/apache/lucene/search/TopTermsRewrite.java +++ b/lucene/core/src/java/org/apache/lucene/search/TopTermsRewrite.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.Comparator; diff --git a/lucene/core/src/java/org/apache/lucene/search/TotalHitCountCollector.java b/lucene/core/src/java/org/apache/lucene/search/TotalHitCountCollector.java index 59b548f2188..e5180f9ed79 100644 --- a/lucene/core/src/java/org/apache/lucene/search/TotalHitCountCollector.java +++ b/lucene/core/src/java/org/apache/lucene/search/TotalHitCountCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + /** * Just counts the total number of hits. diff --git a/lucene/core/src/java/org/apache/lucene/search/TwoPhaseIterator.java b/lucene/core/src/java/org/apache/lucene/search/TwoPhaseIterator.java index 2df1db2ceef..38176bfdb79 100644 --- a/lucene/core/src/java/org/apache/lucene/search/TwoPhaseIterator.java +++ b/lucene/core/src/java/org/apache/lucene/search/TwoPhaseIterator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.Objects; diff --git a/lucene/core/src/java/org/apache/lucene/search/UsageTrackingQueryCachingPolicy.java b/lucene/core/src/java/org/apache/lucene/search/UsageTrackingQueryCachingPolicy.java index 24f165272a8..1f4864519c1 100644 --- a/lucene/core/src/java/org/apache/lucene/search/UsageTrackingQueryCachingPolicy.java +++ b/lucene/core/src/java/org/apache/lucene/search/UsageTrackingQueryCachingPolicy.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/Weight.java b/lucene/core/src/java/org/apache/lucene/search/Weight.java index db9978167f3..40d2aaf0537 100644 --- a/lucene/core/src/java/org/apache/lucene/search/Weight.java +++ b/lucene/core/src/java/org/apache/lucene/search/Weight.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.Set; diff --git a/lucene/core/src/java/org/apache/lucene/search/WildcardQuery.java b/lucene/core/src/java/org/apache/lucene/search/WildcardQuery.java index 7a54fa80a75..b775dca40fe 100644 --- a/lucene/core/src/java/org/apache/lucene/search/WildcardQuery.java +++ b/lucene/core/src/java/org/apache/lucene/search/WildcardQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.util.ArrayList; import java.util.List; diff --git a/lucene/core/src/java/org/apache/lucene/search/package-info.java b/lucene/core/src/java/org/apache/lucene/search/package-info.java index 27f7d551346..b52c8f9ba72 100644 --- a/lucene/core/src/java/org/apache/lucene/search/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/search/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Code to search indices. * diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/AfterEffect.java b/lucene/core/src/java/org/apache/lucene/search/similarities/AfterEffect.java index 186d20b21c9..df6f3d27491 100644 --- a/lucene/core/src/java/org/apache/lucene/search/similarities/AfterEffect.java +++ b/lucene/core/src/java/org/apache/lucene/search/similarities/AfterEffect.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + import org.apache.lucene.search.Explanation; diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/AfterEffectB.java b/lucene/core/src/java/org/apache/lucene/search/similarities/AfterEffectB.java index 21f0193a470..32d17486964 100644 --- a/lucene/core/src/java/org/apache/lucene/search/similarities/AfterEffectB.java +++ b/lucene/core/src/java/org/apache/lucene/search/similarities/AfterEffectB.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + import org.apache.lucene.search.Explanation; diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/AfterEffectL.java b/lucene/core/src/java/org/apache/lucene/search/similarities/AfterEffectL.java index 33012de15f8..f6ba31283bb 100644 --- a/lucene/core/src/java/org/apache/lucene/search/similarities/AfterEffectL.java +++ b/lucene/core/src/java/org/apache/lucene/search/similarities/AfterEffectL.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + import org.apache.lucene.search.Explanation; diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/BM25Similarity.java b/lucene/core/src/java/org/apache/lucene/search/similarities/BM25Similarity.java index 5891a611b80..99f76ef9956 100644 --- a/lucene/core/src/java/org/apache/lucene/search/similarities/BM25Similarity.java +++ b/lucene/core/src/java/org/apache/lucene/search/similarities/BM25Similarity.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/BasicModel.java b/lucene/core/src/java/org/apache/lucene/search/similarities/BasicModel.java index 1c6b00748b6..9293422ea80 100644 --- a/lucene/core/src/java/org/apache/lucene/search/similarities/BasicModel.java +++ b/lucene/core/src/java/org/apache/lucene/search/similarities/BasicModel.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + import org.apache.lucene.search.Explanation; diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/BasicModelBE.java b/lucene/core/src/java/org/apache/lucene/search/similarities/BasicModelBE.java index f9d2fd11b94..12be56cbbae 100644 --- a/lucene/core/src/java/org/apache/lucene/search/similarities/BasicModelBE.java +++ b/lucene/core/src/java/org/apache/lucene/search/similarities/BasicModelBE.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + import static org.apache.lucene.search.similarities.SimilarityBase.log2; diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/BasicModelD.java b/lucene/core/src/java/org/apache/lucene/search/similarities/BasicModelD.java index 67295c5667c..28cd877ec26 100644 --- a/lucene/core/src/java/org/apache/lucene/search/similarities/BasicModelD.java +++ b/lucene/core/src/java/org/apache/lucene/search/similarities/BasicModelD.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + import static org.apache.lucene.search.similarities.SimilarityBase.log2; diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/BasicModelG.java b/lucene/core/src/java/org/apache/lucene/search/similarities/BasicModelG.java index 2e287c637cb..d2d2f0d9815 100644 --- a/lucene/core/src/java/org/apache/lucene/search/similarities/BasicModelG.java +++ b/lucene/core/src/java/org/apache/lucene/search/similarities/BasicModelG.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + import static org.apache.lucene.search.similarities.SimilarityBase.log2; diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/BasicModelIF.java b/lucene/core/src/java/org/apache/lucene/search/similarities/BasicModelIF.java index e5c58417724..fe54122bd6c 100644 --- a/lucene/core/src/java/org/apache/lucene/search/similarities/BasicModelIF.java +++ b/lucene/core/src/java/org/apache/lucene/search/similarities/BasicModelIF.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + import static org.apache.lucene.search.similarities.SimilarityBase.log2; diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/BasicModelIn.java b/lucene/core/src/java/org/apache/lucene/search/similarities/BasicModelIn.java index 17c9a889a3e..5865177ea45 100644 --- a/lucene/core/src/java/org/apache/lucene/search/similarities/BasicModelIn.java +++ b/lucene/core/src/java/org/apache/lucene/search/similarities/BasicModelIn.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + import org.apache.lucene.search.Explanation; import static org.apache.lucene.search.similarities.SimilarityBase.log2; diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/BasicModelIne.java b/lucene/core/src/java/org/apache/lucene/search/similarities/BasicModelIne.java index 4bae8b1afbb..28fa57e6ee9 100644 --- a/lucene/core/src/java/org/apache/lucene/search/similarities/BasicModelIne.java +++ b/lucene/core/src/java/org/apache/lucene/search/similarities/BasicModelIne.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + import static org.apache.lucene.search.similarities.SimilarityBase.log2; diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/BasicModelP.java b/lucene/core/src/java/org/apache/lucene/search/similarities/BasicModelP.java index 9528bac0759..d032a2cc339 100644 --- a/lucene/core/src/java/org/apache/lucene/search/similarities/BasicModelP.java +++ b/lucene/core/src/java/org/apache/lucene/search/similarities/BasicModelP.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + import static org.apache.lucene.search.similarities.SimilarityBase.log2; diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/BasicStats.java b/lucene/core/src/java/org/apache/lucene/search/similarities/BasicStats.java index d09c9f1c0d5..5304d1ff038 100644 --- a/lucene/core/src/java/org/apache/lucene/search/similarities/BasicStats.java +++ b/lucene/core/src/java/org/apache/lucene/search/similarities/BasicStats.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + import org.apache.lucene.index.Terms; diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/ClassicSimilarity.java b/lucene/core/src/java/org/apache/lucene/search/similarities/ClassicSimilarity.java index 93ebf815ba9..3b6cbddbe14 100644 --- a/lucene/core/src/java/org/apache/lucene/search/similarities/ClassicSimilarity.java +++ b/lucene/core/src/java/org/apache/lucene/search/similarities/ClassicSimilarity.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + import org.apache.lucene.index.FieldInvertState; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/DFISimilarity.java b/lucene/core/src/java/org/apache/lucene/search/similarities/DFISimilarity.java index 33da280a7f5..5dea8a4f26e 100644 --- a/lucene/core/src/java/org/apache/lucene/search/similarities/DFISimilarity.java +++ b/lucene/core/src/java/org/apache/lucene/search/similarities/DFISimilarity.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + /** * Implements the Divergence from Independence (DFI) model based on Chi-square statistics diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/DFRSimilarity.java b/lucene/core/src/java/org/apache/lucene/search/similarities/DFRSimilarity.java index 773c1a02530..b77fc5358e4 100644 --- a/lucene/core/src/java/org/apache/lucene/search/similarities/DFRSimilarity.java +++ b/lucene/core/src/java/org/apache/lucene/search/similarities/DFRSimilarity.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + import java.util.List; diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/Distribution.java b/lucene/core/src/java/org/apache/lucene/search/similarities/Distribution.java index a171735b694..8e670b0b8bc 100644 --- a/lucene/core/src/java/org/apache/lucene/search/similarities/Distribution.java +++ b/lucene/core/src/java/org/apache/lucene/search/similarities/Distribution.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + import org.apache.lucene.search.Explanation; diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/DistributionLL.java b/lucene/core/src/java/org/apache/lucene/search/similarities/DistributionLL.java index 85cdd38492d..e34085a327e 100644 --- a/lucene/core/src/java/org/apache/lucene/search/similarities/DistributionLL.java +++ b/lucene/core/src/java/org/apache/lucene/search/similarities/DistributionLL.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + /** * Log-logistic distribution. diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/DistributionSPL.java b/lucene/core/src/java/org/apache/lucene/search/similarities/DistributionSPL.java index 661abd41022..1a9299f317c 100644 --- a/lucene/core/src/java/org/apache/lucene/search/similarities/DistributionSPL.java +++ b/lucene/core/src/java/org/apache/lucene/search/similarities/DistributionSPL.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + /** * The smoothed power-law (SPL) distribution for the information-based framework diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/IBSimilarity.java b/lucene/core/src/java/org/apache/lucene/search/similarities/IBSimilarity.java index 46805aa40c4..0dff0f41830 100644 --- a/lucene/core/src/java/org/apache/lucene/search/similarities/IBSimilarity.java +++ b/lucene/core/src/java/org/apache/lucene/search/similarities/IBSimilarity.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + import java.util.List; diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/Independence.java b/lucene/core/src/java/org/apache/lucene/search/similarities/Independence.java index 1ce820d6dd6..9293f0b2388 100644 --- a/lucene/core/src/java/org/apache/lucene/search/similarities/Independence.java +++ b/lucene/core/src/java/org/apache/lucene/search/similarities/Independence.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + /** * Computes the measure of divergence from independence for DFI diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/IndependenceChiSquared.java b/lucene/core/src/java/org/apache/lucene/search/similarities/IndependenceChiSquared.java index e703449dce2..e209063d6f0 100644 --- a/lucene/core/src/java/org/apache/lucene/search/similarities/IndependenceChiSquared.java +++ b/lucene/core/src/java/org/apache/lucene/search/similarities/IndependenceChiSquared.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + /** * Normalized chi-squared measure of distance from independence diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/IndependenceSaturated.java b/lucene/core/src/java/org/apache/lucene/search/similarities/IndependenceSaturated.java index dadd6f8cbeb..af4bf638b24 100644 --- a/lucene/core/src/java/org/apache/lucene/search/similarities/IndependenceSaturated.java +++ b/lucene/core/src/java/org/apache/lucene/search/similarities/IndependenceSaturated.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + /** * Saturated measure of distance from independence diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/IndependenceStandardized.java b/lucene/core/src/java/org/apache/lucene/search/similarities/IndependenceStandardized.java index 8d36507de79..1f7cda0ced5 100644 --- a/lucene/core/src/java/org/apache/lucene/search/similarities/IndependenceStandardized.java +++ b/lucene/core/src/java/org/apache/lucene/search/similarities/IndependenceStandardized.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + /** * Standardized measure of distance from independence diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/LMDirichletSimilarity.java b/lucene/core/src/java/org/apache/lucene/search/similarities/LMDirichletSimilarity.java index b1c4563fb0a..de59eb9cda8 100644 --- a/lucene/core/src/java/org/apache/lucene/search/similarities/LMDirichletSimilarity.java +++ b/lucene/core/src/java/org/apache/lucene/search/similarities/LMDirichletSimilarity.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + import java.util.List; import java.util.Locale; diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/LMJelinekMercerSimilarity.java b/lucene/core/src/java/org/apache/lucene/search/similarities/LMJelinekMercerSimilarity.java index 9f78f931810..3788b5ca6b9 100644 --- a/lucene/core/src/java/org/apache/lucene/search/similarities/LMJelinekMercerSimilarity.java +++ b/lucene/core/src/java/org/apache/lucene/search/similarities/LMJelinekMercerSimilarity.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + import java.util.List; import java.util.Locale; diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/LMSimilarity.java b/lucene/core/src/java/org/apache/lucene/search/similarities/LMSimilarity.java index 47b1e70a9b2..fb8fbf4d5dc 100644 --- a/lucene/core/src/java/org/apache/lucene/search/similarities/LMSimilarity.java +++ b/lucene/core/src/java/org/apache/lucene/search/similarities/LMSimilarity.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + import java.util.List; import java.util.Locale; diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/Lambda.java b/lucene/core/src/java/org/apache/lucene/search/similarities/Lambda.java index 7680325ded1..39b92ec4b97 100644 --- a/lucene/core/src/java/org/apache/lucene/search/similarities/Lambda.java +++ b/lucene/core/src/java/org/apache/lucene/search/similarities/Lambda.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + import org.apache.lucene.search.Explanation; diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/LambdaDF.java b/lucene/core/src/java/org/apache/lucene/search/similarities/LambdaDF.java index c34cfc62493..ef87c8ae159 100644 --- a/lucene/core/src/java/org/apache/lucene/search/similarities/LambdaDF.java +++ b/lucene/core/src/java/org/apache/lucene/search/similarities/LambdaDF.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + import org.apache.lucene.search.Explanation; diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/LambdaTTF.java b/lucene/core/src/java/org/apache/lucene/search/similarities/LambdaTTF.java index c5ffb50cc2a..20fe652f776 100644 --- a/lucene/core/src/java/org/apache/lucene/search/similarities/LambdaTTF.java +++ b/lucene/core/src/java/org/apache/lucene/search/similarities/LambdaTTF.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + import org.apache.lucene.search.Explanation; diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/MultiSimilarity.java b/lucene/core/src/java/org/apache/lucene/search/similarities/MultiSimilarity.java index 47e1fbf2ae4..c4b7dd67a49 100644 --- a/lucene/core/src/java/org/apache/lucene/search/similarities/MultiSimilarity.java +++ b/lucene/core/src/java/org/apache/lucene/search/similarities/MultiSimilarity.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/Normalization.java b/lucene/core/src/java/org/apache/lucene/search/similarities/Normalization.java index 786726f81a4..0ab70f6b000 100644 --- a/lucene/core/src/java/org/apache/lucene/search/similarities/Normalization.java +++ b/lucene/core/src/java/org/apache/lucene/search/similarities/Normalization.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + import org.apache.lucene.search.Explanation; diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/NormalizationH1.java b/lucene/core/src/java/org/apache/lucene/search/similarities/NormalizationH1.java index 744ec8ec422..e7f47cafd3e 100644 --- a/lucene/core/src/java/org/apache/lucene/search/similarities/NormalizationH1.java +++ b/lucene/core/src/java/org/apache/lucene/search/similarities/NormalizationH1.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + /** * Normalization model that assumes a uniform distribution of the term frequency. diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/NormalizationH2.java b/lucene/core/src/java/org/apache/lucene/search/similarities/NormalizationH2.java index cbeaef16ec0..4bc50045a09 100644 --- a/lucene/core/src/java/org/apache/lucene/search/similarities/NormalizationH2.java +++ b/lucene/core/src/java/org/apache/lucene/search/similarities/NormalizationH2.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + import static org.apache.lucene.search.similarities.SimilarityBase.log2; diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/NormalizationH3.java b/lucene/core/src/java/org/apache/lucene/search/similarities/NormalizationH3.java index 5a1bae8ca68..579cdb5094a 100644 --- a/lucene/core/src/java/org/apache/lucene/search/similarities/NormalizationH3.java +++ b/lucene/core/src/java/org/apache/lucene/search/similarities/NormalizationH3.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + /** * Dirichlet Priors normalization diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/NormalizationZ.java b/lucene/core/src/java/org/apache/lucene/search/similarities/NormalizationZ.java index d5551a63c93..97b92a213b5 100644 --- a/lucene/core/src/java/org/apache/lucene/search/similarities/NormalizationZ.java +++ b/lucene/core/src/java/org/apache/lucene/search/similarities/NormalizationZ.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + /** * Pareto-Zipf Normalization diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/PerFieldSimilarityWrapper.java b/lucene/core/src/java/org/apache/lucene/search/similarities/PerFieldSimilarityWrapper.java index 8da73a82080..cfbb9a5e6ca 100644 --- a/lucene/core/src/java/org/apache/lucene/search/similarities/PerFieldSimilarityWrapper.java +++ b/lucene/core/src/java/org/apache/lucene/search/similarities/PerFieldSimilarityWrapper.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/Similarity.java b/lucene/core/src/java/org/apache/lucene/search/similarities/Similarity.java index 9deaf4713c6..9605c839c10 100644 --- a/lucene/core/src/java/org/apache/lucene/search/similarities/Similarity.java +++ b/lucene/core/src/java/org/apache/lucene/search/similarities/Similarity.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + import org.apache.lucene.index.FieldInvertState; import org.apache.lucene.index.LeafReaderContext; diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/SimilarityBase.java b/lucene/core/src/java/org/apache/lucene/search/similarities/SimilarityBase.java index f69ac17a784..0b7c34274dc 100644 --- a/lucene/core/src/java/org/apache/lucene/search/similarities/SimilarityBase.java +++ b/lucene/core/src/java/org/apache/lucene/search/similarities/SimilarityBase.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/TFIDFSimilarity.java b/lucene/core/src/java/org/apache/lucene/search/similarities/TFIDFSimilarity.java index 8ec82d571b4..a6b1ee5168c 100644 --- a/lucene/core/src/java/org/apache/lucene/search/similarities/TFIDFSimilarity.java +++ b/lucene/core/src/java/org/apache/lucene/search/similarities/TFIDFSimilarity.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/package-info.java b/lucene/core/src/java/org/apache/lucene/search/similarities/package-info.java index a3544d71442..6a0ecc4d98c 100644 --- a/lucene/core/src/java/org/apache/lucene/search/similarities/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/search/similarities/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * This package contains the various ranking models that can be used in Lucene. The * abstract class {@link org.apache.lucene.search.similarities.Similarity} serves diff --git a/lucene/core/src/java/org/apache/lucene/search/spans/ConjunctionSpans.java b/lucene/core/src/java/org/apache/lucene/search/spans/ConjunctionSpans.java index 409634fb582..e275dec0021 100644 --- a/lucene/core/src/java/org/apache/lucene/search/spans/ConjunctionSpans.java +++ b/lucene/core/src/java/org/apache/lucene/search/spans/ConjunctionSpans.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; + import java.io.IOException; import java.util.List; diff --git a/lucene/core/src/java/org/apache/lucene/search/spans/ContainSpans.java b/lucene/core/src/java/org/apache/lucene/search/spans/ContainSpans.java index 5d90d76d440..4e021c7ccf3 100644 --- a/lucene/core/src/java/org/apache/lucene/search/spans/ContainSpans.java +++ b/lucene/core/src/java/org/apache/lucene/search/spans/ContainSpans.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/search/spans/FieldMaskingSpanQuery.java b/lucene/core/src/java/org/apache/lucene/search/spans/FieldMaskingSpanQuery.java index f91ae0eb491..8a2dae3afd1 100644 --- a/lucene/core/src/java/org/apache/lucene/search/spans/FieldMaskingSpanQuery.java +++ b/lucene/core/src/java/org/apache/lucene/search/spans/FieldMaskingSpanQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; + import org.apache.lucene.index.IndexReader; import org.apache.lucene.search.IndexSearcher; diff --git a/lucene/core/src/java/org/apache/lucene/search/spans/FilterSpans.java b/lucene/core/src/java/org/apache/lucene/search/spans/FilterSpans.java index 0d599a27b17..79d51360ae7 100644 --- a/lucene/core/src/java/org/apache/lucene/search/spans/FilterSpans.java +++ b/lucene/core/src/java/org/apache/lucene/search/spans/FilterSpans.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; + import java.io.IOException; import java.util.Objects; diff --git a/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansOrdered.java b/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansOrdered.java index de5e17ea0db..f4054738d2c 100644 --- a/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansOrdered.java +++ b/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansOrdered.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; + import java.io.IOException; import java.util.List; diff --git a/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java b/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java index 07a3caeaf8e..c3402bc78cf 100644 --- a/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java +++ b/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/search/spans/ScoringWrapperSpans.java b/lucene/core/src/java/org/apache/lucene/search/spans/ScoringWrapperSpans.java index d188aa57b21..d38ae839ba4 100644 --- a/lucene/core/src/java/org/apache/lucene/search/spans/ScoringWrapperSpans.java +++ b/lucene/core/src/java/org/apache/lucene/search/spans/ScoringWrapperSpans.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/spans/SpanBoostQuery.java b/lucene/core/src/java/org/apache/lucene/search/spans/SpanBoostQuery.java index 6cea2edc3c1..911fdc09642 100644 --- a/lucene/core/src/java/org/apache/lucene/search/spans/SpanBoostQuery.java +++ b/lucene/core/src/java/org/apache/lucene/search/spans/SpanBoostQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; + import java.io.IOException; import java.util.Map; diff --git a/lucene/core/src/java/org/apache/lucene/search/spans/SpanCollector.java b/lucene/core/src/java/org/apache/lucene/search/spans/SpanCollector.java index 52cb4419361..adaf6f07a83 100644 --- a/lucene/core/src/java/org/apache/lucene/search/spans/SpanCollector.java +++ b/lucene/core/src/java/org/apache/lucene/search/spans/SpanCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; + import org.apache.lucene.index.PostingsEnum; import org.apache.lucene.index.Term; diff --git a/lucene/core/src/java/org/apache/lucene/search/spans/SpanContainQuery.java b/lucene/core/src/java/org/apache/lucene/search/spans/SpanContainQuery.java index 14c1f106f51..06f9467b11e 100644 --- a/lucene/core/src/java/org/apache/lucene/search/spans/SpanContainQuery.java +++ b/lucene/core/src/java/org/apache/lucene/search/spans/SpanContainQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; + import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.LeafReaderContext; diff --git a/lucene/core/src/java/org/apache/lucene/search/spans/SpanContainingQuery.java b/lucene/core/src/java/org/apache/lucene/search/spans/SpanContainingQuery.java index 5d0da2760fe..bfa3f85444c 100644 --- a/lucene/core/src/java/org/apache/lucene/search/spans/SpanContainingQuery.java +++ b/lucene/core/src/java/org/apache/lucene/search/spans/SpanContainingQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/search/spans/SpanFirstQuery.java b/lucene/core/src/java/org/apache/lucene/search/spans/SpanFirstQuery.java index c162c37efed..5672d7715f5 100644 --- a/lucene/core/src/java/org/apache/lucene/search/spans/SpanFirstQuery.java +++ b/lucene/core/src/java/org/apache/lucene/search/spans/SpanFirstQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; + import org.apache.lucene.search.spans.FilterSpans.AcceptStatus; diff --git a/lucene/core/src/java/org/apache/lucene/search/spans/SpanMultiTermQueryWrapper.java b/lucene/core/src/java/org/apache/lucene/search/spans/SpanMultiTermQueryWrapper.java index 3ecc84df7af..95b7e93fca2 100644 --- a/lucene/core/src/java/org/apache/lucene/search/spans/SpanMultiTermQueryWrapper.java +++ b/lucene/core/src/java/org/apache/lucene/search/spans/SpanMultiTermQueryWrapper.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/search/spans/SpanNearQuery.java b/lucene/core/src/java/org/apache/lucene/search/spans/SpanNearQuery.java index 5d967b5d64f..167a7d1fb0e 100644 --- a/lucene/core/src/java/org/apache/lucene/search/spans/SpanNearQuery.java +++ b/lucene/core/src/java/org/apache/lucene/search/spans/SpanNearQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/search/spans/SpanNotQuery.java b/lucene/core/src/java/org/apache/lucene/search/spans/SpanNotQuery.java index 39aeb0a2819..5b2aeaca5de 100644 --- a/lucene/core/src/java/org/apache/lucene/search/spans/SpanNotQuery.java +++ b/lucene/core/src/java/org/apache/lucene/search/spans/SpanNotQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; + import java.io.IOException; import java.util.Map; diff --git a/lucene/core/src/java/org/apache/lucene/search/spans/SpanOrQuery.java b/lucene/core/src/java/org/apache/lucene/search/spans/SpanOrQuery.java index c148979677b..c07ec38e7a4 100644 --- a/lucene/core/src/java/org/apache/lucene/search/spans/SpanOrQuery.java +++ b/lucene/core/src/java/org/apache/lucene/search/spans/SpanOrQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/search/spans/SpanPositionCheckQuery.java b/lucene/core/src/java/org/apache/lucene/search/spans/SpanPositionCheckQuery.java index 79b8ba996e8..b2166e4176e 100644 --- a/lucene/core/src/java/org/apache/lucene/search/spans/SpanPositionCheckQuery.java +++ b/lucene/core/src/java/org/apache/lucene/search/spans/SpanPositionCheckQuery.java @@ -1,4 +1,3 @@ -package org.apache.lucene.search.spans; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/spans/SpanPositionQueue.java b/lucene/core/src/java/org/apache/lucene/search/spans/SpanPositionQueue.java index cf83d1384a9..2d2bd16c555 100644 --- a/lucene/core/src/java/org/apache/lucene/search/spans/SpanPositionQueue.java +++ b/lucene/core/src/java/org/apache/lucene/search/spans/SpanPositionQueue.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; + import org.apache.lucene.util.PriorityQueue; diff --git a/lucene/core/src/java/org/apache/lucene/search/spans/SpanPositionRangeQuery.java b/lucene/core/src/java/org/apache/lucene/search/spans/SpanPositionRangeQuery.java index c64253f38f5..eafc04d3725 100644 --- a/lucene/core/src/java/org/apache/lucene/search/spans/SpanPositionRangeQuery.java +++ b/lucene/core/src/java/org/apache/lucene/search/spans/SpanPositionRangeQuery.java @@ -1,4 +1,3 @@ -package org.apache.lucene.search.spans; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; import org.apache.lucene.search.spans.FilterSpans.AcceptStatus; diff --git a/lucene/core/src/java/org/apache/lucene/search/spans/SpanQuery.java b/lucene/core/src/java/org/apache/lucene/search/spans/SpanQuery.java index 62af21a81b6..12a1129b1fc 100644 --- a/lucene/core/src/java/org/apache/lucene/search/spans/SpanQuery.java +++ b/lucene/core/src/java/org/apache/lucene/search/spans/SpanQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; + import java.io.IOException; import java.util.Collection; diff --git a/lucene/core/src/java/org/apache/lucene/search/spans/SpanScorer.java b/lucene/core/src/java/org/apache/lucene/search/spans/SpanScorer.java index 5a431405630..4841ddcb990 100644 --- a/lucene/core/src/java/org/apache/lucene/search/spans/SpanScorer.java +++ b/lucene/core/src/java/org/apache/lucene/search/spans/SpanScorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; + import java.io.IOException; import java.util.Objects; diff --git a/lucene/core/src/java/org/apache/lucene/search/spans/SpanTermQuery.java b/lucene/core/src/java/org/apache/lucene/search/spans/SpanTermQuery.java index c6c6064620c..bf6c6d0ec5a 100644 --- a/lucene/core/src/java/org/apache/lucene/search/spans/SpanTermQuery.java +++ b/lucene/core/src/java/org/apache/lucene/search/spans/SpanTermQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; + import java.io.IOException; import java.util.Collections; diff --git a/lucene/core/src/java/org/apache/lucene/search/spans/SpanWeight.java b/lucene/core/src/java/org/apache/lucene/search/spans/SpanWeight.java index a38213fc049..8209bd012b8 100644 --- a/lucene/core/src/java/org/apache/lucene/search/spans/SpanWeight.java +++ b/lucene/core/src/java/org/apache/lucene/search/spans/SpanWeight.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; + import java.io.IOException; import java.util.Map; diff --git a/lucene/core/src/java/org/apache/lucene/search/spans/SpanWithinQuery.java b/lucene/core/src/java/org/apache/lucene/search/spans/SpanWithinQuery.java index 21115ff137d..6fbfb671fea 100644 --- a/lucene/core/src/java/org/apache/lucene/search/spans/SpanWithinQuery.java +++ b/lucene/core/src/java/org/apache/lucene/search/spans/SpanWithinQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/search/spans/Spans.java b/lucene/core/src/java/org/apache/lucene/search/spans/Spans.java index 94623447961..785770838c8 100644 --- a/lucene/core/src/java/org/apache/lucene/search/spans/Spans.java +++ b/lucene/core/src/java/org/apache/lucene/search/spans/Spans.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/search/spans/TermSpans.java b/lucene/core/src/java/org/apache/lucene/search/spans/TermSpans.java index 84da2128a1e..f1e1aed6557 100644 --- a/lucene/core/src/java/org/apache/lucene/search/spans/TermSpans.java +++ b/lucene/core/src/java/org/apache/lucene/search/spans/TermSpans.java @@ -1,10 +1,10 @@ -package org.apache.lucene.search.spans; /* - * Copyright 2005 The Apache Software Foundation - * - * Licensed 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 + * 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 * @@ -14,7 +14,7 @@ package org.apache.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.search.spans; import java.io.IOException; import java.util.Objects; diff --git a/lucene/core/src/java/org/apache/lucene/search/spans/package-info.java b/lucene/core/src/java/org/apache/lucene/search/spans/package-info.java index 4fc88d3bc98..971db762d61 100644 --- a/lucene/core/src/java/org/apache/lucene/search/spans/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/search/spans/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * The calculus of spans. * diff --git a/lucene/core/src/java/org/apache/lucene/store/AlreadyClosedException.java b/lucene/core/src/java/org/apache/lucene/store/AlreadyClosedException.java index 83eb7a5b78a..2dbbc93f31e 100644 --- a/lucene/core/src/java/org/apache/lucene/store/AlreadyClosedException.java +++ b/lucene/core/src/java/org/apache/lucene/store/AlreadyClosedException.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + /** * This exception is thrown when there is an attempt to diff --git a/lucene/core/src/java/org/apache/lucene/store/BaseDirectory.java b/lucene/core/src/java/org/apache/lucene/store/BaseDirectory.java index 42b425343e3..a5fff241b49 100644 --- a/lucene/core/src/java/org/apache/lucene/store/BaseDirectory.java +++ b/lucene/core/src/java/org/apache/lucene/store/BaseDirectory.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/store/BufferedChecksum.java b/lucene/core/src/java/org/apache/lucene/store/BufferedChecksum.java index 8b34d706bd2..4378c9a7705 100644 --- a/lucene/core/src/java/org/apache/lucene/store/BufferedChecksum.java +++ b/lucene/core/src/java/org/apache/lucene/store/BufferedChecksum.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.util.zip.Checksum; diff --git a/lucene/core/src/java/org/apache/lucene/store/BufferedChecksumIndexInput.java b/lucene/core/src/java/org/apache/lucene/store/BufferedChecksumIndexInput.java index 6a8d5c0200b..1d71962ec97 100644 --- a/lucene/core/src/java/org/apache/lucene/store/BufferedChecksumIndexInput.java +++ b/lucene/core/src/java/org/apache/lucene/store/BufferedChecksumIndexInput.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.IOException; import java.util.zip.CRC32; diff --git a/lucene/core/src/java/org/apache/lucene/store/BufferedIndexInput.java b/lucene/core/src/java/org/apache/lucene/store/BufferedIndexInput.java index 8fbc6a12476..3f15eea7959 100644 --- a/lucene/core/src/java/org/apache/lucene/store/BufferedIndexInput.java +++ b/lucene/core/src/java/org/apache/lucene/store/BufferedIndexInput.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.EOFException; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/store/ByteArrayDataInput.java b/lucene/core/src/java/org/apache/lucene/store/ByteArrayDataInput.java index 1565a6e1c53..c2bfbdeb568 100644 --- a/lucene/core/src/java/org/apache/lucene/store/ByteArrayDataInput.java +++ b/lucene/core/src/java/org/apache/lucene/store/ByteArrayDataInput.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/java/org/apache/lucene/store/ByteArrayDataOutput.java b/lucene/core/src/java/org/apache/lucene/store/ByteArrayDataOutput.java index 4a6599f29ee..1a31b9a000a 100644 --- a/lucene/core/src/java/org/apache/lucene/store/ByteArrayDataOutput.java +++ b/lucene/core/src/java/org/apache/lucene/store/ByteArrayDataOutput.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/java/org/apache/lucene/store/ByteBufferIndexInput.java b/lucene/core/src/java/org/apache/lucene/store/ByteBufferIndexInput.java index b29b06a19d7..8e8ef90655a 100644 --- a/lucene/core/src/java/org/apache/lucene/store/ByteBufferIndexInput.java +++ b/lucene/core/src/java/org/apache/lucene/store/ByteBufferIndexInput.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.EOFException; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/store/ChecksumIndexInput.java b/lucene/core/src/java/org/apache/lucene/store/ChecksumIndexInput.java index e19c3a41058..6a78c88fb98 100644 --- a/lucene/core/src/java/org/apache/lucene/store/ChecksumIndexInput.java +++ b/lucene/core/src/java/org/apache/lucene/store/ChecksumIndexInput.java @@ -1,7 +1,3 @@ -package org.apache.lucene.store; - -import java.io.IOException; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,10 @@ import java.io.IOException; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + +import java.io.IOException; + /** * Extension of IndexInput, computing checksum as it goes. diff --git a/lucene/core/src/java/org/apache/lucene/store/DataInput.java b/lucene/core/src/java/org/apache/lucene/store/DataInput.java index ebdaa8e3114..037211f9491 100644 --- a/lucene/core/src/java/org/apache/lucene/store/DataInput.java +++ b/lucene/core/src/java/org/apache/lucene/store/DataInput.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/lucene/core/src/java/org/apache/lucene/store/DataOutput.java b/lucene/core/src/java/org/apache/lucene/store/DataOutput.java index efdba774694..1f6dd74d9cd 100644 --- a/lucene/core/src/java/org/apache/lucene/store/DataOutput.java +++ b/lucene/core/src/java/org/apache/lucene/store/DataOutput.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.IOException; import java.util.Map; diff --git a/lucene/core/src/java/org/apache/lucene/store/Directory.java b/lucene/core/src/java/org/apache/lucene/store/Directory.java index 8aa5fa1e545..4ed7f4c9035 100644 --- a/lucene/core/src/java/org/apache/lucene/store/Directory.java +++ b/lucene/core/src/java/org/apache/lucene/store/Directory.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.Closeable; import java.io.FileNotFoundException; diff --git a/lucene/core/src/java/org/apache/lucene/store/FSDirectory.java b/lucene/core/src/java/org/apache/lucene/store/FSDirectory.java index 400ad5d0e61..584168a06a2 100644 --- a/lucene/core/src/java/org/apache/lucene/store/FSDirectory.java +++ b/lucene/core/src/java/org/apache/lucene/store/FSDirectory.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.FilterOutputStream; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/store/FSLockFactory.java b/lucene/core/src/java/org/apache/lucene/store/FSLockFactory.java index d666075b142..ebe667f11ac 100644 --- a/lucene/core/src/java/org/apache/lucene/store/FSLockFactory.java +++ b/lucene/core/src/java/org/apache/lucene/store/FSLockFactory.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/store/FileSwitchDirectory.java b/lucene/core/src/java/org/apache/lucene/store/FileSwitchDirectory.java index 0b986f4795b..a9eba062dcb 100644 --- a/lucene/core/src/java/org/apache/lucene/store/FileSwitchDirectory.java +++ b/lucene/core/src/java/org/apache/lucene/store/FileSwitchDirectory.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.IOException; import java.nio.file.AtomicMoveNotSupportedException; diff --git a/lucene/core/src/java/org/apache/lucene/store/FilterDirectory.java b/lucene/core/src/java/org/apache/lucene/store/FilterDirectory.java index 7c550c1d610..5df571358ae 100644 --- a/lucene/core/src/java/org/apache/lucene/store/FilterDirectory.java +++ b/lucene/core/src/java/org/apache/lucene/store/FilterDirectory.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.IOException; import java.util.Collection; diff --git a/lucene/core/src/java/org/apache/lucene/store/FlushInfo.java b/lucene/core/src/java/org/apache/lucene/store/FlushInfo.java index 100c6100f16..5d52a511df3 100644 --- a/lucene/core/src/java/org/apache/lucene/store/FlushInfo.java +++ b/lucene/core/src/java/org/apache/lucene/store/FlushInfo.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + /** *

A FlushInfo provides information required for a FLUSH context. diff --git a/lucene/core/src/java/org/apache/lucene/store/IOContext.java b/lucene/core/src/java/org/apache/lucene/store/IOContext.java index b9c9992f6ae..2ceac815ec6 100644 --- a/lucene/core/src/java/org/apache/lucene/store/IOContext.java +++ b/lucene/core/src/java/org/apache/lucene/store/IOContext.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + /** * IOContext holds additional details on the merge/search context. A IOContext diff --git a/lucene/core/src/java/org/apache/lucene/store/IndexInput.java b/lucene/core/src/java/org/apache/lucene/store/IndexInput.java index 02a17349f07..8c9186ceb36 100644 --- a/lucene/core/src/java/org/apache/lucene/store/IndexInput.java +++ b/lucene/core/src/java/org/apache/lucene/store/IndexInput.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.Closeable; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/store/IndexOutput.java b/lucene/core/src/java/org/apache/lucene/store/IndexOutput.java index 16163eae3ca..e4881e0307f 100644 --- a/lucene/core/src/java/org/apache/lucene/store/IndexOutput.java +++ b/lucene/core/src/java/org/apache/lucene/store/IndexOutput.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.Closeable; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/store/InputStreamDataInput.java b/lucene/core/src/java/org/apache/lucene/store/InputStreamDataInput.java index 79003df0f31..62e4b5dff1e 100644 --- a/lucene/core/src/java/org/apache/lucene/store/InputStreamDataInput.java +++ b/lucene/core/src/java/org/apache/lucene/store/InputStreamDataInput.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.*; diff --git a/lucene/core/src/java/org/apache/lucene/store/Lock.java b/lucene/core/src/java/org/apache/lucene/store/Lock.java index 70b855bbd54..e44c4438ff9 100644 --- a/lucene/core/src/java/org/apache/lucene/store/Lock.java +++ b/lucene/core/src/java/org/apache/lucene/store/Lock.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.Closeable; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/store/LockFactory.java b/lucene/core/src/java/org/apache/lucene/store/LockFactory.java index ca92590bd17..48c0372ee59 100644 --- a/lucene/core/src/java/org/apache/lucene/store/LockFactory.java +++ b/lucene/core/src/java/org/apache/lucene/store/LockFactory.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/store/LockObtainFailedException.java b/lucene/core/src/java/org/apache/lucene/store/LockObtainFailedException.java index dedfea14a91..574ff267ccf 100644 --- a/lucene/core/src/java/org/apache/lucene/store/LockObtainFailedException.java +++ b/lucene/core/src/java/org/apache/lucene/store/LockObtainFailedException.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.store; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/store/LockReleaseFailedException.java b/lucene/core/src/java/org/apache/lucene/store/LockReleaseFailedException.java index 68d296a3756..60f2a17a9ee 100644 --- a/lucene/core/src/java/org/apache/lucene/store/LockReleaseFailedException.java +++ b/lucene/core/src/java/org/apache/lucene/store/LockReleaseFailedException.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.store; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/store/LockStressTest.java b/lucene/core/src/java/org/apache/lucene/store/LockStressTest.java index 8c2d8a86feb..2008f91b6cc 100644 --- a/lucene/core/src/java/org/apache/lucene/store/LockStressTest.java +++ b/lucene/core/src/java/org/apache/lucene/store/LockStressTest.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.IOException; import java.io.InputStream; diff --git a/lucene/core/src/java/org/apache/lucene/store/LockValidatingDirectoryWrapper.java b/lucene/core/src/java/org/apache/lucene/store/LockValidatingDirectoryWrapper.java index 389c56ddfe4..f6c88675337 100644 --- a/lucene/core/src/java/org/apache/lucene/store/LockValidatingDirectoryWrapper.java +++ b/lucene/core/src/java/org/apache/lucene/store/LockValidatingDirectoryWrapper.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.IOException; import java.util.Collection; diff --git a/lucene/core/src/java/org/apache/lucene/store/LockVerifyServer.java b/lucene/core/src/java/org/apache/lucene/store/LockVerifyServer.java index 89da64c3412..3ce0c06e010 100644 --- a/lucene/core/src/java/org/apache/lucene/store/LockVerifyServer.java +++ b/lucene/core/src/java/org/apache/lucene/store/LockVerifyServer.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.IOException; import java.io.InputStream; diff --git a/lucene/core/src/java/org/apache/lucene/store/MMapDirectory.java b/lucene/core/src/java/org/apache/lucene/store/MMapDirectory.java index 0808eb65a1d..6098c7fd13f 100644 --- a/lucene/core/src/java/org/apache/lucene/store/MMapDirectory.java +++ b/lucene/core/src/java/org/apache/lucene/store/MMapDirectory.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.IOException; import java.nio.ByteBuffer; diff --git a/lucene/core/src/java/org/apache/lucene/store/MergeInfo.java b/lucene/core/src/java/org/apache/lucene/store/MergeInfo.java index 6098a078259..ee2e43afa73 100644 --- a/lucene/core/src/java/org/apache/lucene/store/MergeInfo.java +++ b/lucene/core/src/java/org/apache/lucene/store/MergeInfo.java @@ -1,4 +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 @@ -15,6 +14,7 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; /** *

A MergeInfo provides information required for a MERGE context. diff --git a/lucene/core/src/java/org/apache/lucene/store/NIOFSDirectory.java b/lucene/core/src/java/org/apache/lucene/store/NIOFSDirectory.java index b7392904fd1..d8ca115f054 100644 --- a/lucene/core/src/java/org/apache/lucene/store/NIOFSDirectory.java +++ b/lucene/core/src/java/org/apache/lucene/store/NIOFSDirectory.java @@ -1,21 +1,20 @@ -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 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 - * + * 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. + * 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.store; import java.io.EOFException; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/store/NRTCachingDirectory.java b/lucene/core/src/java/org/apache/lucene/store/NRTCachingDirectory.java index fd5e3d7b92e..b96c5211dec 100644 --- a/lucene/core/src/java/org/apache/lucene/store/NRTCachingDirectory.java +++ b/lucene/core/src/java/org/apache/lucene/store/NRTCachingDirectory.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.FileNotFoundException; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/store/NativeFSLockFactory.java b/lucene/core/src/java/org/apache/lucene/store/NativeFSLockFactory.java index 7ab06ae119f..70270146ffa 100644 --- a/lucene/core/src/java/org/apache/lucene/store/NativeFSLockFactory.java +++ b/lucene/core/src/java/org/apache/lucene/store/NativeFSLockFactory.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.nio.channels.FileChannel; import java.nio.channels.FileLock; diff --git a/lucene/core/src/java/org/apache/lucene/store/NoLockFactory.java b/lucene/core/src/java/org/apache/lucene/store/NoLockFactory.java index 7a209c51c79..9ebeccde488 100644 --- a/lucene/core/src/java/org/apache/lucene/store/NoLockFactory.java +++ b/lucene/core/src/java/org/apache/lucene/store/NoLockFactory.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/store/OutputStreamDataOutput.java b/lucene/core/src/java/org/apache/lucene/store/OutputStreamDataOutput.java index a8d6c5371cf..23c7720d08e 100644 --- a/lucene/core/src/java/org/apache/lucene/store/OutputStreamDataOutput.java +++ b/lucene/core/src/java/org/apache/lucene/store/OutputStreamDataOutput.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.*; diff --git a/lucene/core/src/java/org/apache/lucene/store/OutputStreamIndexOutput.java b/lucene/core/src/java/org/apache/lucene/store/OutputStreamIndexOutput.java index 41c5ce6d69e..c26f750cacb 100644 --- a/lucene/core/src/java/org/apache/lucene/store/OutputStreamIndexOutput.java +++ b/lucene/core/src/java/org/apache/lucene/store/OutputStreamIndexOutput.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.BufferedOutputStream; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/store/RAMDirectory.java b/lucene/core/src/java/org/apache/lucene/store/RAMDirectory.java index d1dc0d071b6..2165b3b0351 100644 --- a/lucene/core/src/java/org/apache/lucene/store/RAMDirectory.java +++ b/lucene/core/src/java/org/apache/lucene/store/RAMDirectory.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.FileNotFoundException; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/store/RAMFile.java b/lucene/core/src/java/org/apache/lucene/store/RAMFile.java index 461acec3014..d8ae693519d 100644 --- a/lucene/core/src/java/org/apache/lucene/store/RAMFile.java +++ b/lucene/core/src/java/org/apache/lucene/store/RAMFile.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.util.ArrayList; import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/store/RAMInputStream.java b/lucene/core/src/java/org/apache/lucene/store/RAMInputStream.java index 193a088fd38..7c8c7a35643 100644 --- a/lucene/core/src/java/org/apache/lucene/store/RAMInputStream.java +++ b/lucene/core/src/java/org/apache/lucene/store/RAMInputStream.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.EOFException; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/store/RAMOutputStream.java b/lucene/core/src/java/org/apache/lucene/store/RAMOutputStream.java index aefe16d96b1..3477fe449cd 100644 --- a/lucene/core/src/java/org/apache/lucene/store/RAMOutputStream.java +++ b/lucene/core/src/java/org/apache/lucene/store/RAMOutputStream.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.IOException; import java.util.Collection; diff --git a/lucene/core/src/java/org/apache/lucene/store/RandomAccessInput.java b/lucene/core/src/java/org/apache/lucene/store/RandomAccessInput.java index 3fbcdd5a462..1a54dc72e93 100644 --- a/lucene/core/src/java/org/apache/lucene/store/RandomAccessInput.java +++ b/lucene/core/src/java/org/apache/lucene/store/RandomAccessInput.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/store/RateLimitedIndexOutput.java b/lucene/core/src/java/org/apache/lucene/store/RateLimitedIndexOutput.java index c2f474f9890..9c5d26c18f2 100644 --- a/lucene/core/src/java/org/apache/lucene/store/RateLimitedIndexOutput.java +++ b/lucene/core/src/java/org/apache/lucene/store/RateLimitedIndexOutput.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/store/RateLimiter.java b/lucene/core/src/java/org/apache/lucene/store/RateLimiter.java index 99ed3c78beb..f99cddda7a7 100644 --- a/lucene/core/src/java/org/apache/lucene/store/RateLimiter.java +++ b/lucene/core/src/java/org/apache/lucene/store/RateLimiter.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/store/SimpleFSDirectory.java b/lucene/core/src/java/org/apache/lucene/store/SimpleFSDirectory.java index 2daf98fa821..a4d5271cbf1 100644 --- a/lucene/core/src/java/org/apache/lucene/store/SimpleFSDirectory.java +++ b/lucene/core/src/java/org/apache/lucene/store/SimpleFSDirectory.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.EOFException; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/store/SimpleFSLockFactory.java b/lucene/core/src/java/org/apache/lucene/store/SimpleFSLockFactory.java index 0985ef67afe..f0b9683f5ed 100644 --- a/lucene/core/src/java/org/apache/lucene/store/SimpleFSLockFactory.java +++ b/lucene/core/src/java/org/apache/lucene/store/SimpleFSLockFactory.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.IOException; import java.nio.file.AccessDeniedException; diff --git a/lucene/core/src/java/org/apache/lucene/store/SingleInstanceLockFactory.java b/lucene/core/src/java/org/apache/lucene/store/SingleInstanceLockFactory.java index 68d3f34e91a..6bfcb0a92d0 100644 --- a/lucene/core/src/java/org/apache/lucene/store/SingleInstanceLockFactory.java +++ b/lucene/core/src/java/org/apache/lucene/store/SingleInstanceLockFactory.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.IOException; import java.util.HashSet; diff --git a/lucene/core/src/java/org/apache/lucene/store/SleepingLockWrapper.java b/lucene/core/src/java/org/apache/lucene/store/SleepingLockWrapper.java index 7f808d1ca54..f63f9793c85 100644 --- a/lucene/core/src/java/org/apache/lucene/store/SleepingLockWrapper.java +++ b/lucene/core/src/java/org/apache/lucene/store/SleepingLockWrapper.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/store/TrackingDirectoryWrapper.java b/lucene/core/src/java/org/apache/lucene/store/TrackingDirectoryWrapper.java index aa7214c2bff..d78a5b6464d 100644 --- a/lucene/core/src/java/org/apache/lucene/store/TrackingDirectoryWrapper.java +++ b/lucene/core/src/java/org/apache/lucene/store/TrackingDirectoryWrapper.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.IOException; import java.util.Collections; diff --git a/lucene/core/src/java/org/apache/lucene/store/VerifyingLockFactory.java b/lucene/core/src/java/org/apache/lucene/store/VerifyingLockFactory.java index 37906735ae0..6a7214ba378 100644 --- a/lucene/core/src/java/org/apache/lucene/store/VerifyingLockFactory.java +++ b/lucene/core/src/java/org/apache/lucene/store/VerifyingLockFactory.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.IOException; import java.io.InputStream; diff --git a/lucene/core/src/java/org/apache/lucene/store/package-info.java b/lucene/core/src/java/org/apache/lucene/store/package-info.java index 048a0a865eb..f4b66bfcd1a 100644 --- a/lucene/core/src/java/org/apache/lucene/store/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/store/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Binary i/o API, used for all index data. */ diff --git a/lucene/core/src/java/org/apache/lucene/util/Accountable.java b/lucene/core/src/java/org/apache/lucene/util/Accountable.java index 5bae03a229d..901d8054e75 100644 --- a/lucene/core/src/java/org/apache/lucene/util/Accountable.java +++ b/lucene/core/src/java/org/apache/lucene/util/Accountable.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.util.Collection; import java.util.Collections; diff --git a/lucene/core/src/java/org/apache/lucene/util/Accountables.java b/lucene/core/src/java/org/apache/lucene/util/Accountables.java index ae7a09b72e4..cdf50fdc9e2 100644 --- a/lucene/core/src/java/org/apache/lucene/util/Accountables.java +++ b/lucene/core/src/java/org/apache/lucene/util/Accountables.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.util.ArrayList; import java.util.Collection; diff --git a/lucene/core/src/java/org/apache/lucene/util/ArrayInPlaceMergeSorter.java b/lucene/core/src/java/org/apache/lucene/util/ArrayInPlaceMergeSorter.java index cacaceefbb6..40c38634709 100644 --- a/lucene/core/src/java/org/apache/lucene/util/ArrayInPlaceMergeSorter.java +++ b/lucene/core/src/java/org/apache/lucene/util/ArrayInPlaceMergeSorter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.util.Comparator; diff --git a/lucene/core/src/java/org/apache/lucene/util/ArrayIntroSorter.java b/lucene/core/src/java/org/apache/lucene/util/ArrayIntroSorter.java index 072abf54367..957afdbb6c9 100644 --- a/lucene/core/src/java/org/apache/lucene/util/ArrayIntroSorter.java +++ b/lucene/core/src/java/org/apache/lucene/util/ArrayIntroSorter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.util.Comparator; diff --git a/lucene/core/src/java/org/apache/lucene/util/ArrayTimSorter.java b/lucene/core/src/java/org/apache/lucene/util/ArrayTimSorter.java index a9befe16b9e..3532bb054db 100644 --- a/lucene/core/src/java/org/apache/lucene/util/ArrayTimSorter.java +++ b/lucene/core/src/java/org/apache/lucene/util/ArrayTimSorter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.util.Comparator; diff --git a/lucene/core/src/java/org/apache/lucene/util/ArrayUtil.java b/lucene/core/src/java/org/apache/lucene/util/ArrayUtil.java index c88022a9319..a826d353f36 100644 --- a/lucene/core/src/java/org/apache/lucene/util/ArrayUtil.java +++ b/lucene/core/src/java/org/apache/lucene/util/ArrayUtil.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.util.Arrays; import java.util.Collection; diff --git a/lucene/core/src/java/org/apache/lucene/util/Attribute.java b/lucene/core/src/java/org/apache/lucene/util/Attribute.java index e78d6f211c8..0829271e375 100644 --- a/lucene/core/src/java/org/apache/lucene/util/Attribute.java +++ b/lucene/core/src/java/org/apache/lucene/util/Attribute.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + /** * Base interface for attributes. diff --git a/lucene/core/src/java/org/apache/lucene/util/AttributeFactory.java b/lucene/core/src/java/org/apache/lucene/util/AttributeFactory.java index b8647206d0a..6c3d6dbfafe 100644 --- a/lucene/core/src/java/org/apache/lucene/util/AttributeFactory.java +++ b/lucene/core/src/java/org/apache/lucene/util/AttributeFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; diff --git a/lucene/core/src/java/org/apache/lucene/util/AttributeImpl.java b/lucene/core/src/java/org/apache/lucene/util/AttributeImpl.java index 8e581fc44f2..b7226612ef7 100644 --- a/lucene/core/src/java/org/apache/lucene/util/AttributeImpl.java +++ b/lucene/core/src/java/org/apache/lucene/util/AttributeImpl.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + /** * Base class for Attributes that can be added to a diff --git a/lucene/core/src/java/org/apache/lucene/util/AttributeReflector.java b/lucene/core/src/java/org/apache/lucene/util/AttributeReflector.java index 22b2bb0355a..338a346aaf3 100644 --- a/lucene/core/src/java/org/apache/lucene/util/AttributeReflector.java +++ b/lucene/core/src/java/org/apache/lucene/util/AttributeReflector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + /** * This interface is used to reflect contents of {@link AttributeSource} or {@link AttributeImpl}. diff --git a/lucene/core/src/java/org/apache/lucene/util/AttributeSource.java b/lucene/core/src/java/org/apache/lucene/util/AttributeSource.java index 06bc2762097..6c39025ba4a 100644 --- a/lucene/core/src/java/org/apache/lucene/util/AttributeSource.java +++ b/lucene/core/src/java/org/apache/lucene/util/AttributeSource.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.util.Collections; import java.util.Iterator; diff --git a/lucene/core/src/java/org/apache/lucene/util/BitDocIdSet.java b/lucene/core/src/java/org/apache/lucene/util/BitDocIdSet.java index c499afb0379..90d4f7b1a8a 100644 --- a/lucene/core/src/java/org/apache/lucene/util/BitDocIdSet.java +++ b/lucene/core/src/java/org/apache/lucene/util/BitDocIdSet.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import org.apache.lucene.search.DocIdSet; import org.apache.lucene.search.DocIdSetIterator; diff --git a/lucene/core/src/java/org/apache/lucene/util/BitSet.java b/lucene/core/src/java/org/apache/lucene/util/BitSet.java index c87cb3e4feb..6f3a25c5b75 100644 --- a/lucene/core/src/java/org/apache/lucene/util/BitSet.java +++ b/lucene/core/src/java/org/apache/lucene/util/BitSet.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/util/BitSetIterator.java b/lucene/core/src/java/org/apache/lucene/util/BitSetIterator.java index 147c1372670..9e181c6a163 100644 --- a/lucene/core/src/java/org/apache/lucene/util/BitSetIterator.java +++ b/lucene/core/src/java/org/apache/lucene/util/BitSetIterator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import org.apache.lucene.search.DocIdSetIterator; diff --git a/lucene/core/src/java/org/apache/lucene/util/BitUtil.java b/lucene/core/src/java/org/apache/lucene/util/BitUtil.java index 8059865cd02..90f4f17fa51 100644 --- a/lucene/core/src/java/org/apache/lucene/util/BitUtil.java +++ b/lucene/core/src/java/org/apache/lucene/util/BitUtil.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.util; // from org.apache.solr.util rev 555343 /** A variety of high efficiency bit twiddling routines. diff --git a/lucene/core/src/java/org/apache/lucene/util/Bits.java b/lucene/core/src/java/org/apache/lucene/util/Bits.java index a5cef3bf5d7..cfd39187457 100644 --- a/lucene/core/src/java/org/apache/lucene/util/Bits.java +++ b/lucene/core/src/java/org/apache/lucene/util/Bits.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + /** * Interface for Bitset-like structures. diff --git a/lucene/core/src/java/org/apache/lucene/util/ByteBlockPool.java b/lucene/core/src/java/org/apache/lucene/util/ByteBlockPool.java index 75405338ab1..5f8fd4180d6 100644 --- a/lucene/core/src/java/org/apache/lucene/util/ByteBlockPool.java +++ b/lucene/core/src/java/org/apache/lucene/util/ByteBlockPool.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.util.Arrays; import java.util.List; diff --git a/lucene/core/src/java/org/apache/lucene/util/BytesRef.java b/lucene/core/src/java/org/apache/lucene/util/BytesRef.java index a114f5ebe05..c30c0dbce6d 100644 --- a/lucene/core/src/java/org/apache/lucene/util/BytesRef.java +++ b/lucene/core/src/java/org/apache/lucene/util/BytesRef.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.util.Arrays; import java.util.Comparator; diff --git a/lucene/core/src/java/org/apache/lucene/util/BytesRefArray.java b/lucene/core/src/java/org/apache/lucene/util/BytesRefArray.java index 13d2ddea98f..d7394c7ddd4 100644 --- a/lucene/core/src/java/org/apache/lucene/util/BytesRefArray.java +++ b/lucene/core/src/java/org/apache/lucene/util/BytesRefArray.java @@ -1,21 +1,20 @@ -package org.apache.lucene.util; - /* * 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 - * + * 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. + * 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.util; import java.util.Arrays; import java.util.Comparator; diff --git a/lucene/core/src/java/org/apache/lucene/util/BytesRefBuilder.java b/lucene/core/src/java/org/apache/lucene/util/BytesRefBuilder.java index 205425ab6c9..2bfa2f2dc70 100644 --- a/lucene/core/src/java/org/apache/lucene/util/BytesRefBuilder.java +++ b/lucene/core/src/java/org/apache/lucene/util/BytesRefBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/util/BytesRefHash.java b/lucene/core/src/java/org/apache/lucene/util/BytesRefHash.java index ec5c4cf8a28..149e8b75365 100644 --- a/lucene/core/src/java/org/apache/lucene/util/BytesRefHash.java +++ b/lucene/core/src/java/org/apache/lucene/util/BytesRefHash.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.util.Arrays; import java.util.Comparator; diff --git a/lucene/core/src/java/org/apache/lucene/util/BytesRefIterator.java b/lucene/core/src/java/org/apache/lucene/util/BytesRefIterator.java index 063cc34279d..fa7bb453c79 100644 --- a/lucene/core/src/java/org/apache/lucene/util/BytesRefIterator.java +++ b/lucene/core/src/java/org/apache/lucene/util/BytesRefIterator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/util/CharsRef.java b/lucene/core/src/java/org/apache/lucene/util/CharsRef.java index a10581576f9..aacdfcc5a96 100644 --- a/lucene/core/src/java/org/apache/lucene/util/CharsRef.java +++ b/lucene/core/src/java/org/apache/lucene/util/CharsRef.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.util.Arrays; import java.util.Comparator; diff --git a/lucene/core/src/java/org/apache/lucene/util/CharsRefBuilder.java b/lucene/core/src/java/org/apache/lucene/util/CharsRefBuilder.java index b617306692d..0dc0e7ae6fb 100644 --- a/lucene/core/src/java/org/apache/lucene/util/CharsRefBuilder.java +++ b/lucene/core/src/java/org/apache/lucene/util/CharsRefBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/util/CloseableThreadLocal.java b/lucene/core/src/java/org/apache/lucene/util/CloseableThreadLocal.java index 9681f42ac38..6e75be4019c 100644 --- a/lucene/core/src/java/org/apache/lucene/util/CloseableThreadLocal.java +++ b/lucene/core/src/java/org/apache/lucene/util/CloseableThreadLocal.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.io.Closeable; import java.lang.ref.WeakReference; diff --git a/lucene/core/src/java/org/apache/lucene/util/CollectionUtil.java b/lucene/core/src/java/org/apache/lucene/util/CollectionUtil.java index cb23d4524da..0fc6cc80faf 100644 --- a/lucene/core/src/java/org/apache/lucene/util/CollectionUtil.java +++ b/lucene/core/src/java/org/apache/lucene/util/CollectionUtil.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.util.Collections; diff --git a/lucene/core/src/java/org/apache/lucene/util/CommandLineUtil.java b/lucene/core/src/java/org/apache/lucene/util/CommandLineUtil.java index 9150dad1d9e..c4b22776c92 100644 --- a/lucene/core/src/java/org/apache/lucene/util/CommandLineUtil.java +++ b/lucene/core/src/java/org/apache/lucene/util/CommandLineUtil.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; diff --git a/lucene/core/src/java/org/apache/lucene/util/Constants.java b/lucene/core/src/java/org/apache/lucene/util/Constants.java index 3ec275b9a75..7df0efca4c5 100644 --- a/lucene/core/src/java/org/apache/lucene/util/Constants.java +++ b/lucene/core/src/java/org/apache/lucene/util/Constants.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.util.StringTokenizer; diff --git a/lucene/core/src/java/org/apache/lucene/util/Counter.java b/lucene/core/src/java/org/apache/lucene/util/Counter.java index 9aa5dec009d..0ac5c34c218 100644 --- a/lucene/core/src/java/org/apache/lucene/util/Counter.java +++ b/lucene/core/src/java/org/apache/lucene/util/Counter.java @@ -1,7 +1,3 @@ -package org.apache.lucene.util; - -import java.util.concurrent.atomic.AtomicLong; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,10 @@ import java.util.concurrent.atomic.AtomicLong; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + +import java.util.concurrent.atomic.AtomicLong; + /** * Simple counter class diff --git a/lucene/core/src/java/org/apache/lucene/util/DocIdSetBuilder.java b/lucene/core/src/java/org/apache/lucene/util/DocIdSetBuilder.java index 8f23847d838..31a9762a783 100644 --- a/lucene/core/src/java/org/apache/lucene/util/DocIdSetBuilder.java +++ b/lucene/core/src/java/org/apache/lucene/util/DocIdSetBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/util/FilterIterator.java b/lucene/core/src/java/org/apache/lucene/util/FilterIterator.java index fe26a08da95..0dbfef2edc9 100644 --- a/lucene/core/src/java/org/apache/lucene/util/FilterIterator.java +++ b/lucene/core/src/java/org/apache/lucene/util/FilterIterator.java @@ -1,21 +1,20 @@ -package org.apache.lucene.util; - /* * 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 - * + * 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. + * 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.util; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/lucene/core/src/java/org/apache/lucene/util/FixedBitSet.java b/lucene/core/src/java/org/apache/lucene/util/FixedBitSet.java index 1313da9452f..3668604e2d6 100644 --- a/lucene/core/src/java/org/apache/lucene/util/FixedBitSet.java +++ b/lucene/core/src/java/org/apache/lucene/util/FixedBitSet.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/util/FrequencyTrackingRingBuffer.java b/lucene/core/src/java/org/apache/lucene/util/FrequencyTrackingRingBuffer.java index a362e951102..9b0fd4984df 100644 --- a/lucene/core/src/java/org/apache/lucene/util/FrequencyTrackingRingBuffer.java +++ b/lucene/core/src/java/org/apache/lucene/util/FrequencyTrackingRingBuffer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.util.Arrays; import java.util.HashMap; diff --git a/lucene/core/src/java/org/apache/lucene/util/IOUtils.java b/lucene/core/src/java/org/apache/lucene/util/IOUtils.java index 510545f8250..de5e4618fb5 100644 --- a/lucene/core/src/java/org/apache/lucene/util/IOUtils.java +++ b/lucene/core/src/java/org/apache/lucene/util/IOUtils.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.io.BufferedReader; import java.io.Closeable; diff --git a/lucene/core/src/java/org/apache/lucene/util/InPlaceMergeSorter.java b/lucene/core/src/java/org/apache/lucene/util/InPlaceMergeSorter.java index 54e5bde40ea..dbf7d72ca13 100644 --- a/lucene/core/src/java/org/apache/lucene/util/InPlaceMergeSorter.java +++ b/lucene/core/src/java/org/apache/lucene/util/InPlaceMergeSorter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + /** {@link Sorter} implementation based on the merge-sort algorithm that merges * in place (no extra memory will be allocated). Small arrays are sorted with diff --git a/lucene/core/src/java/org/apache/lucene/util/InfoStream.java b/lucene/core/src/java/org/apache/lucene/util/InfoStream.java index bc67637e3e2..c82d6140975 100644 --- a/lucene/core/src/java/org/apache/lucene/util/InfoStream.java +++ b/lucene/core/src/java/org/apache/lucene/util/InfoStream.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import org.apache.lucene.index.IndexWriter; // javadocs import org.apache.lucene.index.SegmentInfos; // javadocs diff --git a/lucene/core/src/java/org/apache/lucene/util/IntArrayDocIdSet.java b/lucene/core/src/java/org/apache/lucene/util/IntArrayDocIdSet.java index a201fc49498..e82956cae8c 100644 --- a/lucene/core/src/java/org/apache/lucene/util/IntArrayDocIdSet.java +++ b/lucene/core/src/java/org/apache/lucene/util/IntArrayDocIdSet.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/util/IntBlockPool.java b/lucene/core/src/java/org/apache/lucene/util/IntBlockPool.java index 6e0f807e29a..75859800cfd 100644 --- a/lucene/core/src/java/org/apache/lucene/util/IntBlockPool.java +++ b/lucene/core/src/java/org/apache/lucene/util/IntBlockPool.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/util/IntroSorter.java b/lucene/core/src/java/org/apache/lucene/util/IntroSorter.java index 9efc4e8efe4..d9cdd62bf61 100644 --- a/lucene/core/src/java/org/apache/lucene/util/IntroSorter.java +++ b/lucene/core/src/java/org/apache/lucene/util/IntroSorter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + /** * {@link Sorter} implementation based on a variant of the quicksort algorithm diff --git a/lucene/core/src/java/org/apache/lucene/util/IntsRef.java b/lucene/core/src/java/org/apache/lucene/util/IntsRef.java index c696a214118..981210d3c3e 100644 --- a/lucene/core/src/java/org/apache/lucene/util/IntsRef.java +++ b/lucene/core/src/java/org/apache/lucene/util/IntsRef.java @@ -1,7 +1,3 @@ -package org.apache.lucene.util; - -import java.util.Arrays; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,10 @@ import java.util.Arrays; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + +import java.util.Arrays; + /** Represents int[], as a slice (offset + length) into an * existing int[]. The {@link #ints} member should never be null; use diff --git a/lucene/core/src/java/org/apache/lucene/util/IntsRefBuilder.java b/lucene/core/src/java/org/apache/lucene/util/IntsRefBuilder.java index 17c20d3d8b2..4f160ba2d38 100644 --- a/lucene/core/src/java/org/apache/lucene/util/IntsRefBuilder.java +++ b/lucene/core/src/java/org/apache/lucene/util/IntsRefBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + /** * A builder for {@link IntsRef} instances. diff --git a/lucene/core/src/java/org/apache/lucene/util/LSBRadixSorter.java b/lucene/core/src/java/org/apache/lucene/util/LSBRadixSorter.java index 5d8208ac1f4..22f95b654b7 100644 --- a/lucene/core/src/java/org/apache/lucene/util/LSBRadixSorter.java +++ b/lucene/core/src/java/org/apache/lucene/util/LSBRadixSorter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/util/LegacyNumericUtils.java b/lucene/core/src/java/org/apache/lucene/util/LegacyNumericUtils.java index 1cec17f2826..3cada71feeb 100644 --- a/lucene/core/src/java/org/apache/lucene/util/LegacyNumericUtils.java +++ b/lucene/core/src/java/org/apache/lucene/util/LegacyNumericUtils.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/util/LongBitSet.java b/lucene/core/src/java/org/apache/lucene/util/LongBitSet.java index 6645707c6b9..ad8fa641c69 100644 --- a/lucene/core/src/java/org/apache/lucene/util/LongBitSet.java +++ b/lucene/core/src/java/org/apache/lucene/util/LongBitSet.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/util/LongValues.java b/lucene/core/src/java/org/apache/lucene/util/LongValues.java index 138ea55a6ae..e4b8a35fc41 100644 --- a/lucene/core/src/java/org/apache/lucene/util/LongValues.java +++ b/lucene/core/src/java/org/apache/lucene/util/LongValues.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import org.apache.lucene.index.NumericDocValues; import org.apache.lucene.util.packed.PackedInts; diff --git a/lucene/core/src/java/org/apache/lucene/util/LongsRef.java b/lucene/core/src/java/org/apache/lucene/util/LongsRef.java index 5446bc83f2a..61b85cf35b2 100644 --- a/lucene/core/src/java/org/apache/lucene/util/LongsRef.java +++ b/lucene/core/src/java/org/apache/lucene/util/LongsRef.java @@ -1,7 +1,3 @@ -package org.apache.lucene.util; - -import java.util.Arrays; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,10 @@ import java.util.Arrays; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + +import java.util.Arrays; + /** Represents long[], as a slice (offset + length) into an * existing long[]. The {@link #longs} member should never be null; use diff --git a/lucene/core/src/java/org/apache/lucene/util/MapOfSets.java b/lucene/core/src/java/org/apache/lucene/util/MapOfSets.java index e81449540f5..3cebbd049c1 100644 --- a/lucene/core/src/java/org/apache/lucene/util/MapOfSets.java +++ b/lucene/core/src/java/org/apache/lucene/util/MapOfSets.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.util.Set; diff --git a/lucene/core/src/java/org/apache/lucene/util/MathUtil.java b/lucene/core/src/java/org/apache/lucene/util/MathUtil.java index 8b17600a2d4..09437fe1509 100644 --- a/lucene/core/src/java/org/apache/lucene/util/MathUtil.java +++ b/lucene/core/src/java/org/apache/lucene/util/MathUtil.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.math.BigInteger; diff --git a/lucene/core/src/java/org/apache/lucene/util/MergedIterator.java b/lucene/core/src/java/org/apache/lucene/util/MergedIterator.java index 082a68d81e0..16932ae061a 100644 --- a/lucene/core/src/java/org/apache/lucene/util/MergedIterator.java +++ b/lucene/core/src/java/org/apache/lucene/util/MergedIterator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/lucene/core/src/java/org/apache/lucene/util/MutableBits.java b/lucene/core/src/java/org/apache/lucene/util/MutableBits.java index 9eedc308d6d..3927cac9385 100644 --- a/lucene/core/src/java/org/apache/lucene/util/MutableBits.java +++ b/lucene/core/src/java/org/apache/lucene/util/MutableBits.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + /** * Extension of Bits for live documents. diff --git a/lucene/core/src/java/org/apache/lucene/util/NamedSPILoader.java b/lucene/core/src/java/org/apache/lucene/util/NamedSPILoader.java index 33f45b27025..b882ec7c87e 100644 --- a/lucene/core/src/java/org/apache/lucene/util/NamedSPILoader.java +++ b/lucene/core/src/java/org/apache/lucene/util/NamedSPILoader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.util.Collections; import java.util.Iterator; diff --git a/lucene/core/src/java/org/apache/lucene/util/NamedThreadFactory.java b/lucene/core/src/java/org/apache/lucene/util/NamedThreadFactory.java index 841743cfea8..bae00316a9f 100644 --- a/lucene/core/src/java/org/apache/lucene/util/NamedThreadFactory.java +++ b/lucene/core/src/java/org/apache/lucene/util/NamedThreadFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.util.Locale; import java.util.concurrent.Executors; diff --git a/lucene/core/src/java/org/apache/lucene/util/NotDocIdSet.java b/lucene/core/src/java/org/apache/lucene/util/NotDocIdSet.java index 3f6d0767fd5..67a2c333734 100644 --- a/lucene/core/src/java/org/apache/lucene/util/NotDocIdSet.java +++ b/lucene/core/src/java/org/apache/lucene/util/NotDocIdSet.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/util/NumericUtils.java b/lucene/core/src/java/org/apache/lucene/util/NumericUtils.java index 6d1ab2dec23..b66f4682cba 100644 --- a/lucene/core/src/java/org/apache/lucene/util/NumericUtils.java +++ b/lucene/core/src/java/org/apache/lucene/util/NumericUtils.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.math.BigInteger; import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/util/OfflineSorter.java b/lucene/core/src/java/org/apache/lucene/util/OfflineSorter.java index 92dfd843eb7..8516ec7f718 100644 --- a/lucene/core/src/java/org/apache/lucene/util/OfflineSorter.java +++ b/lucene/core/src/java/org/apache/lucene/util/OfflineSorter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.io.Closeable; import java.io.EOFException; diff --git a/lucene/core/src/java/org/apache/lucene/util/PagedBytes.java b/lucene/core/src/java/org/apache/lucene/util/PagedBytes.java index d0ff9413f33..ad26f857e41 100644 --- a/lucene/core/src/java/org/apache/lucene/util/PagedBytes.java +++ b/lucene/core/src/java/org/apache/lucene/util/PagedBytes.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/util/PrintStreamInfoStream.java b/lucene/core/src/java/org/apache/lucene/util/PrintStreamInfoStream.java index c197d975bbe..03dc3a1d002 100644 --- a/lucene/core/src/java/org/apache/lucene/util/PrintStreamInfoStream.java +++ b/lucene/core/src/java/org/apache/lucene/util/PrintStreamInfoStream.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.io.IOException; import java.io.PrintStream; diff --git a/lucene/core/src/java/org/apache/lucene/util/PriorityQueue.java b/lucene/core/src/java/org/apache/lucene/util/PriorityQueue.java index b58a9b8e1e9..83ac613b676 100644 --- a/lucene/core/src/java/org/apache/lucene/util/PriorityQueue.java +++ b/lucene/core/src/java/org/apache/lucene/util/PriorityQueue.java @@ -1,8 +1,3 @@ -package org.apache.lucene.util; - -import java.util.Iterator; -import java.util.NoSuchElementException; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -19,6 +14,11 @@ import java.util.NoSuchElementException; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + +import java.util.Iterator; +import java.util.NoSuchElementException; + /** * A PriorityQueue maintains a partial ordering of its elements such that the diff --git a/lucene/core/src/java/org/apache/lucene/util/QueryBuilder.java b/lucene/core/src/java/org/apache/lucene/util/QueryBuilder.java index 4e3ded602d9..7acff490c7c 100644 --- a/lucene/core/src/java/org/apache/lucene/util/QueryBuilder.java +++ b/lucene/core/src/java/org/apache/lucene/util/QueryBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/util/RamUsageEstimator.java b/lucene/core/src/java/org/apache/lucene/util/RamUsageEstimator.java index 3ff2632b9f8..763d9e5d34b 100644 --- a/lucene/core/src/java/org/apache/lucene/util/RamUsageEstimator.java +++ b/lucene/core/src/java/org/apache/lucene/util/RamUsageEstimator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.lang.reflect.Array; import java.lang.reflect.Field; diff --git a/lucene/core/src/java/org/apache/lucene/util/RecyclingByteBlockAllocator.java b/lucene/core/src/java/org/apache/lucene/util/RecyclingByteBlockAllocator.java index b31ce2d3b8e..9e5b5d2b778 100644 --- a/lucene/core/src/java/org/apache/lucene/util/RecyclingByteBlockAllocator.java +++ b/lucene/core/src/java/org/apache/lucene/util/RecyclingByteBlockAllocator.java @@ -1,7 +1,3 @@ -package org.apache.lucene.util; - -import org.apache.lucene.util.ByteBlockPool.Allocator; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,10 @@ import org.apache.lucene.util.ByteBlockPool.Allocator; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + +import org.apache.lucene.util.ByteBlockPool.Allocator; + /** * A {@link ByteBlockPool.Allocator} implementation that recycles unused byte diff --git a/lucene/core/src/java/org/apache/lucene/util/RecyclingIntBlockAllocator.java b/lucene/core/src/java/org/apache/lucene/util/RecyclingIntBlockAllocator.java index 44f89056129..437426cc7f5 100644 --- a/lucene/core/src/java/org/apache/lucene/util/RecyclingIntBlockAllocator.java +++ b/lucene/core/src/java/org/apache/lucene/util/RecyclingIntBlockAllocator.java @@ -1,7 +1,3 @@ -package org.apache.lucene.util; - -import org.apache.lucene.util.IntBlockPool.Allocator; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,10 @@ import org.apache.lucene.util.IntBlockPool.Allocator; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + +import org.apache.lucene.util.IntBlockPool.Allocator; + /** * A {@link Allocator} implementation that recycles unused int diff --git a/lucene/core/src/java/org/apache/lucene/util/RefCount.java b/lucene/core/src/java/org/apache/lucene/util/RefCount.java index 836fdbeb2fd..989add2a320 100644 --- a/lucene/core/src/java/org/apache/lucene/util/RefCount.java +++ b/lucene/core/src/java/org/apache/lucene/util/RefCount.java @@ -1,8 +1,3 @@ -package org.apache.lucene.util; - -import java.io.IOException; -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 @@ -19,6 +14,11 @@ import java.util.concurrent.atomic.AtomicInteger; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + +import java.io.IOException; +import java.util.concurrent.atomic.AtomicInteger; + /** * Manages reference counting for a given object. Extensions can override diff --git a/lucene/core/src/java/org/apache/lucene/util/RoaringDocIdSet.java b/lucene/core/src/java/org/apache/lucene/util/RoaringDocIdSet.java index 2a5ebc26a53..9709c300058 100644 --- a/lucene/core/src/java/org/apache/lucene/util/RoaringDocIdSet.java +++ b/lucene/core/src/java/org/apache/lucene/util/RoaringDocIdSet.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/util/RollingBuffer.java b/lucene/core/src/java/org/apache/lucene/util/RollingBuffer.java index 4cf03f53233..aad95b68dcf 100644 --- a/lucene/core/src/java/org/apache/lucene/util/RollingBuffer.java +++ b/lucene/core/src/java/org/apache/lucene/util/RollingBuffer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + /** Acts like forever growing T[], but internally uses a * circular buffer to reuse instances of T. diff --git a/lucene/core/src/java/org/apache/lucene/util/SPIClassIterator.java b/lucene/core/src/java/org/apache/lucene/util/SPIClassIterator.java index 6293e45415b..79a9573a456 100644 --- a/lucene/core/src/java/org/apache/lucene/util/SPIClassIterator.java +++ b/lucene/core/src/java/org/apache/lucene/util/SPIClassIterator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.io.IOException; import java.io.InputStream; diff --git a/lucene/core/src/java/org/apache/lucene/util/SentinelIntSet.java b/lucene/core/src/java/org/apache/lucene/util/SentinelIntSet.java index 2bb4bde6e75..46162d929d5 100644 --- a/lucene/core/src/java/org/apache/lucene/util/SentinelIntSet.java +++ b/lucene/core/src/java/org/apache/lucene/util/SentinelIntSet.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/util/SetOnce.java b/lucene/core/src/java/org/apache/lucene/util/SetOnce.java index d9792540ea8..9be88ecfe4d 100644 --- a/lucene/core/src/java/org/apache/lucene/util/SetOnce.java +++ b/lucene/core/src/java/org/apache/lucene/util/SetOnce.java @@ -1,7 +1,3 @@ -package org.apache.lucene.util; - -import java.util.concurrent.atomic.AtomicBoolean; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,10 @@ import java.util.concurrent.atomic.AtomicBoolean; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + +import java.util.concurrent.atomic.AtomicBoolean; + /** * A convenient class which offers a semi-immutable object wrapper diff --git a/lucene/core/src/java/org/apache/lucene/util/SloppyMath.java b/lucene/core/src/java/org/apache/lucene/util/SloppyMath.java index 41122304a87..9a05704f05b 100644 --- a/lucene/core/src/java/org/apache/lucene/util/SloppyMath.java +++ b/lucene/core/src/java/org/apache/lucene/util/SloppyMath.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + /* some code derived from jodk: http://code.google.com/p/jodk/ (apache 2.0) * asin() derived from fdlibm: http://www.netlib.org/fdlibm/e_asin.c (public domain): diff --git a/lucene/core/src/java/org/apache/lucene/util/SmallFloat.java b/lucene/core/src/java/org/apache/lucene/util/SmallFloat.java index 301e1f57a32..39395ac5d39 100644 --- a/lucene/core/src/java/org/apache/lucene/util/SmallFloat.java +++ b/lucene/core/src/java/org/apache/lucene/util/SmallFloat.java @@ -1,10 +1,10 @@ -package org.apache.lucene.util; /* - * Copyright 2005 The Apache Software Foundation - * - * Licensed 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 + * 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 * @@ -14,7 +14,7 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.util; /** Floating point numbers smaller than 32 bits. * diff --git a/lucene/core/src/java/org/apache/lucene/util/Sorter.java b/lucene/core/src/java/org/apache/lucene/util/Sorter.java index 6ae43c8c286..451d271072c 100644 --- a/lucene/core/src/java/org/apache/lucene/util/Sorter.java +++ b/lucene/core/src/java/org/apache/lucene/util/Sorter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.util.Comparator; diff --git a/lucene/core/src/java/org/apache/lucene/util/SparseFixedBitSet.java b/lucene/core/src/java/org/apache/lucene/util/SparseFixedBitSet.java index 7ee1a2f748e..0cb9bc54eac 100644 --- a/lucene/core/src/java/org/apache/lucene/util/SparseFixedBitSet.java +++ b/lucene/core/src/java/org/apache/lucene/util/SparseFixedBitSet.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/util/StrictStringTokenizer.java b/lucene/core/src/java/org/apache/lucene/util/StrictStringTokenizer.java index d93e0879975..14f176f5b89 100644 --- a/lucene/core/src/java/org/apache/lucene/util/StrictStringTokenizer.java +++ b/lucene/core/src/java/org/apache/lucene/util/StrictStringTokenizer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + /** Used for parsing Version strings so we don't have to * use overkill String.split nor StringTokenizer (which silently diff --git a/lucene/core/src/java/org/apache/lucene/util/StringHelper.java b/lucene/core/src/java/org/apache/lucene/util/StringHelper.java index bbbcdcd2337..c733e157e8d 100644 --- a/lucene/core/src/java/org/apache/lucene/util/StringHelper.java +++ b/lucene/core/src/java/org/apache/lucene/util/StringHelper.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.io.DataInputStream; import java.math.BigInteger; diff --git a/lucene/core/src/java/org/apache/lucene/util/SuppressForbidden.java b/lucene/core/src/java/org/apache/lucene/util/SuppressForbidden.java index afe9b302f0b..244d0dc7886 100644 --- a/lucene/core/src/java/org/apache/lucene/util/SuppressForbidden.java +++ b/lucene/core/src/java/org/apache/lucene/util/SuppressForbidden.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/lucene/core/src/java/org/apache/lucene/util/ThreadInterruptedException.java b/lucene/core/src/java/org/apache/lucene/util/ThreadInterruptedException.java index e97ebe98f65..4e636b7f188 100644 --- a/lucene/core/src/java/org/apache/lucene/util/ThreadInterruptedException.java +++ b/lucene/core/src/java/org/apache/lucene/util/ThreadInterruptedException.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -7,15 +5,16 @@ package org.apache.lucene.util; * 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 - *

+ * + * 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.util; /** * Thrown by lucene on detecting that Thread.interrupt() had diff --git a/lucene/core/src/java/org/apache/lucene/util/TimSorter.java b/lucene/core/src/java/org/apache/lucene/util/TimSorter.java index dd0ddc32eee..d36b648c045 100644 --- a/lucene/core/src/java/org/apache/lucene/util/TimSorter.java +++ b/lucene/core/src/java/org/apache/lucene/util/TimSorter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/util/ToStringUtils.java b/lucene/core/src/java/org/apache/lucene/util/ToStringUtils.java index 26853718b81..64ad9469d1c 100644 --- a/lucene/core/src/java/org/apache/lucene/util/ToStringUtils.java +++ b/lucene/core/src/java/org/apache/lucene/util/ToStringUtils.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + /** * Helper methods to ease implementing {@link Object#toString()}. diff --git a/lucene/core/src/java/org/apache/lucene/util/UnicodeUtil.java b/lucene/core/src/java/org/apache/lucene/util/UnicodeUtil.java index f24f5edfb52..1a8022d8d99 100644 --- a/lucene/core/src/java/org/apache/lucene/util/UnicodeUtil.java +++ b/lucene/core/src/java/org/apache/lucene/util/UnicodeUtil.java @@ -1,6 +1,3 @@ -package org.apache.lucene.util; - - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +14,9 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + + /* diff --git a/lucene/core/src/java/org/apache/lucene/util/Version.java b/lucene/core/src/java/org/apache/lucene/util/Version.java index 61c109392fe..2b4cc57bf01 100644 --- a/lucene/core/src/java/org/apache/lucene/util/Version.java +++ b/lucene/core/src/java/org/apache/lucene/util/Version.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.text.ParseException; diff --git a/lucene/core/src/java/org/apache/lucene/util/VirtualMethod.java b/lucene/core/src/java/org/apache/lucene/util/VirtualMethod.java index 10d2be740dd..f21c16bbda2 100644 --- a/lucene/core/src/java/org/apache/lucene/util/VirtualMethod.java +++ b/lucene/core/src/java/org/apache/lucene/util/VirtualMethod.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.lang.reflect.Method; import java.util.Collections; diff --git a/lucene/core/src/java/org/apache/lucene/util/WeakIdentityMap.java b/lucene/core/src/java/org/apache/lucene/util/WeakIdentityMap.java index 2784615a509..bcee767ad12 100644 --- a/lucene/core/src/java/org/apache/lucene/util/WeakIdentityMap.java +++ b/lucene/core/src/java/org/apache/lucene/util/WeakIdentityMap.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.lang.ref.Reference; import java.lang.ref.ReferenceQueue; diff --git a/lucene/core/src/java/org/apache/lucene/util/automaton/Automaton.java b/lucene/core/src/java/org/apache/lucene/util/automaton/Automaton.java index e7ca8a98680..6c26a87edef 100644 --- a/lucene/core/src/java/org/apache/lucene/util/automaton/Automaton.java +++ b/lucene/core/src/java/org/apache/lucene/util/automaton/Automaton.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.automaton; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.automaton; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.automaton; + //import java.io.IOException; //import java.io.PrintWriter; diff --git a/lucene/core/src/java/org/apache/lucene/util/automaton/ByteRunAutomaton.java b/lucene/core/src/java/org/apache/lucene/util/automaton/ByteRunAutomaton.java index e020ab44eb8..138f5c467b5 100644 --- a/lucene/core/src/java/org/apache/lucene/util/automaton/ByteRunAutomaton.java +++ b/lucene/core/src/java/org/apache/lucene/util/automaton/ByteRunAutomaton.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.automaton; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.automaton; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.automaton; + /** * Automaton representation for matching UTF-8 byte[]. diff --git a/lucene/core/src/java/org/apache/lucene/util/automaton/CharacterRunAutomaton.java b/lucene/core/src/java/org/apache/lucene/util/automaton/CharacterRunAutomaton.java index 07c546eced6..2db30b4eda0 100644 --- a/lucene/core/src/java/org/apache/lucene/util/automaton/CharacterRunAutomaton.java +++ b/lucene/core/src/java/org/apache/lucene/util/automaton/CharacterRunAutomaton.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.automaton; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.automaton; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.automaton; + /** * Automaton representation for matching char[]. diff --git a/lucene/core/src/java/org/apache/lucene/util/automaton/CompiledAutomaton.java b/lucene/core/src/java/org/apache/lucene/util/automaton/CompiledAutomaton.java index f10d1779fc1..cd599e335cd 100644 --- a/lucene/core/src/java/org/apache/lucene/util/automaton/CompiledAutomaton.java +++ b/lucene/core/src/java/org/apache/lucene/util/automaton/CompiledAutomaton.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.automaton; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.automaton; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.automaton; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/util/automaton/DaciukMihovAutomatonBuilder.java b/lucene/core/src/java/org/apache/lucene/util/automaton/DaciukMihovAutomatonBuilder.java index 9a6269f47a5..0ac28678ade 100644 --- a/lucene/core/src/java/org/apache/lucene/util/automaton/DaciukMihovAutomatonBuilder.java +++ b/lucene/core/src/java/org/apache/lucene/util/automaton/DaciukMihovAutomatonBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.automaton; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.automaton; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.automaton; + import java.util.*; diff --git a/lucene/core/src/java/org/apache/lucene/util/automaton/FiniteStringsIterator.java b/lucene/core/src/java/org/apache/lucene/util/automaton/FiniteStringsIterator.java index 454057f5104..229cdc9fa54 100644 --- a/lucene/core/src/java/org/apache/lucene/util/automaton/FiniteStringsIterator.java +++ b/lucene/core/src/java/org/apache/lucene/util/automaton/FiniteStringsIterator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.automaton; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.automaton; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.automaton; + import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.IntsRef; diff --git a/lucene/core/src/java/org/apache/lucene/util/automaton/Lev1ParametricDescription.java b/lucene/core/src/java/org/apache/lucene/util/automaton/Lev1ParametricDescription.java index 51e244caa41..68325c1b972 100644 --- a/lucene/core/src/java/org/apache/lucene/util/automaton/Lev1ParametricDescription.java +++ b/lucene/core/src/java/org/apache/lucene/util/automaton/Lev1ParametricDescription.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.automaton; - /* * 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.lucene.util.automaton; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.automaton; // The following code was generated with the moman/finenight pkg // This package is available under the MIT License, see NOTICE.txt diff --git a/lucene/core/src/java/org/apache/lucene/util/automaton/Lev1TParametricDescription.java b/lucene/core/src/java/org/apache/lucene/util/automaton/Lev1TParametricDescription.java index 49d0abc712c..d1bda79e8c0 100644 --- a/lucene/core/src/java/org/apache/lucene/util/automaton/Lev1TParametricDescription.java +++ b/lucene/core/src/java/org/apache/lucene/util/automaton/Lev1TParametricDescription.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.automaton; - /* * 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.lucene.util.automaton; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.automaton; // The following code was generated with the moman/finenight pkg // This package is available under the MIT License, see NOTICE.txt diff --git a/lucene/core/src/java/org/apache/lucene/util/automaton/Lev2ParametricDescription.java b/lucene/core/src/java/org/apache/lucene/util/automaton/Lev2ParametricDescription.java index 9869cfc9581..b1e191e1ccb 100644 --- a/lucene/core/src/java/org/apache/lucene/util/automaton/Lev2ParametricDescription.java +++ b/lucene/core/src/java/org/apache/lucene/util/automaton/Lev2ParametricDescription.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.automaton; - /* * 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.lucene.util.automaton; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.automaton; // The following code was generated with the moman/finenight pkg // This package is available under the MIT License, see NOTICE.txt diff --git a/lucene/core/src/java/org/apache/lucene/util/automaton/Lev2TParametricDescription.java b/lucene/core/src/java/org/apache/lucene/util/automaton/Lev2TParametricDescription.java index 27921303148..52fb92856cf 100644 --- a/lucene/core/src/java/org/apache/lucene/util/automaton/Lev2TParametricDescription.java +++ b/lucene/core/src/java/org/apache/lucene/util/automaton/Lev2TParametricDescription.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.automaton; - /* * 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.lucene.util.automaton; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.automaton; // The following code was generated with the moman/finenight pkg // This package is available under the MIT License, see NOTICE.txt diff --git a/lucene/core/src/java/org/apache/lucene/util/automaton/LevenshteinAutomata.java b/lucene/core/src/java/org/apache/lucene/util/automaton/LevenshteinAutomata.java index 7fc3af414d3..4a07f4bce3c 100644 --- a/lucene/core/src/java/org/apache/lucene/util/automaton/LevenshteinAutomata.java +++ b/lucene/core/src/java/org/apache/lucene/util/automaton/LevenshteinAutomata.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.automaton; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.automaton; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.automaton; + import java.util.Iterator; import java.util.SortedSet; diff --git a/lucene/core/src/java/org/apache/lucene/util/automaton/LimitedFiniteStringsIterator.java b/lucene/core/src/java/org/apache/lucene/util/automaton/LimitedFiniteStringsIterator.java index 90107e4629b..5a67456d76b 100644 --- a/lucene/core/src/java/org/apache/lucene/util/automaton/LimitedFiniteStringsIterator.java +++ b/lucene/core/src/java/org/apache/lucene/util/automaton/LimitedFiniteStringsIterator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.automaton; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.automaton; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.automaton; + import org.apache.lucene.util.IntsRef; diff --git a/lucene/core/src/java/org/apache/lucene/util/automaton/SortedIntSet.java b/lucene/core/src/java/org/apache/lucene/util/automaton/SortedIntSet.java index d66f9dea6d4..38218a55765 100644 --- a/lucene/core/src/java/org/apache/lucene/util/automaton/SortedIntSet.java +++ b/lucene/core/src/java/org/apache/lucene/util/automaton/SortedIntSet.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.automaton; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.automaton; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.automaton; + import java.util.TreeMap; import java.util.Map; diff --git a/lucene/core/src/java/org/apache/lucene/util/automaton/TooComplexToDeterminizeException.java b/lucene/core/src/java/org/apache/lucene/util/automaton/TooComplexToDeterminizeException.java index 5fb4639de5e..4b8c08d886f 100644 --- a/lucene/core/src/java/org/apache/lucene/util/automaton/TooComplexToDeterminizeException.java +++ b/lucene/core/src/java/org/apache/lucene/util/automaton/TooComplexToDeterminizeException.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.automaton; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.automaton; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.automaton; + /** * This exception is thrown when determinizing an automaton would result in one diff --git a/lucene/core/src/java/org/apache/lucene/util/automaton/Transition.java b/lucene/core/src/java/org/apache/lucene/util/automaton/Transition.java index fc5b6589a9b..8d87d467cbb 100644 --- a/lucene/core/src/java/org/apache/lucene/util/automaton/Transition.java +++ b/lucene/core/src/java/org/apache/lucene/util/automaton/Transition.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.automaton; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.automaton; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.automaton; + /** Holds one transition from an {@link Automaton}. This is typically * used temporarily when iterating through transitions by invoking diff --git a/lucene/core/src/java/org/apache/lucene/util/automaton/UTF32ToUTF8.java b/lucene/core/src/java/org/apache/lucene/util/automaton/UTF32ToUTF8.java index 059ee09b4bb..cc1f6e97b88 100644 --- a/lucene/core/src/java/org/apache/lucene/util/automaton/UTF32ToUTF8.java +++ b/lucene/core/src/java/org/apache/lucene/util/automaton/UTF32ToUTF8.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.automaton; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.automaton; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.automaton; + import java.util.Arrays; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/util/automaton/createLevAutomata.py b/lucene/core/src/java/org/apache/lucene/util/automaton/createLevAutomata.py index 12b9194a6e8..bd0ab457bad 100644 --- a/lucene/core/src/java/org/apache/lucene/util/automaton/createLevAutomata.py +++ b/lucene/core/src/java/org/apache/lucene/util/automaton/createLevAutomata.py @@ -21,7 +21,7 @@ import math import os import sys -#sys.path.insert(0, 'moman/finenight/python') +# sys.path.insert(0, 'moman/finenight/python') sys.path.insert(0, '../../../../../../../../build/core/moman/finenight/python') try: from possibleStates import genTransitions @@ -31,8 +31,8 @@ except ImportError: MODE = 'array' PACKED = True WORD = 64 -LOG2_WORD = int(math.log(WORD)/math.log(2)) -#MODE = 'switch' +LOG2_WORD = int(math.log(WORD) / math.log(2)) +# MODE = 'switch' class LineOutput: @@ -47,7 +47,7 @@ class LineOutput: self._indent = self._indent[:-2] if indent != 0: - indent0 = ' ' * (len(self._indent)/2+indent) + indent0 = ' ' * (len(self._indent) / 2 + indent) else: indent0 = self._indent @@ -79,7 +79,7 @@ class LineOutput: def outdent(self): assert self._indent != self.startIndent self._indent = self._indent[:-2] - + def charVarNumber(charVar): """ Maps binary number (eg [1, 0, 1]) to its decimal value (5). @@ -87,7 +87,7 @@ def charVarNumber(charVar): p = 1 sum = 0 - downTo = len(charVar)-1 + downTo = len(charVar) - 1 while downTo >= 0: sum += p * int(charVar[downTo]) p *= 2 @@ -120,8 +120,6 @@ def main(): w = LineOutput() - w('package org.apache.lucene.util.automaton;') - w('') w('/*') w(' * Licensed to the Apache Software Foundation (ASF) under one or more') w(' * contributor license agreements. See the NOTICE file distributed with') @@ -138,6 +136,7 @@ def main(): w(' * See the License for the specific language governing permissions and') w(' * limitations under the License.') w(' */') + w('package org.apache.lucene.util.automaton;') w('') w('// The following code was generated with the moman/finenight pkg') w('// This package is available under the MIT License, see NOTICE.txt') @@ -167,14 +166,14 @@ def main(): w(' int state = absState/(w+1);') w(' int offset = absState%(w+1);') w(' assert offset >= 0;') - w('') + w('') machines = [] - + for i, map in enumerate(tables): if i == 0: w('if (position == w) {') - elif i == len(tables)-1: + elif i == len(tables) - 1: w('} else {') else: w('} else if (position == w-%d) {' % i) @@ -200,7 +199,7 @@ def main(): if i != 0 and MODE == 'switch': w('case %s: // <%s>' % (charVarNumber(charVar), ','.join([str(x) for x in charVar]))) w.indent() - + l = states.items() byFromState = {} @@ -209,17 +208,17 @@ def main(): byAction = {} for s, (toS, offset) in l: state = str(s) - + toState = str(toS) if state not in stateMap: - stateMap[state] = len(stateMap)-1 + stateMap[state] = len(stateMap) - 1 if toState not in stateMap: - stateMap[toState] = len(stateMap)-1 + stateMap[toState] = len(stateMap) - 1 - byFromState[stateMap[state]] = (1+stateMap[toState], offset) + byFromState[stateMap[state]] = (1 + stateMap[toState], offset) - fromStateDesc = s[1:len(s)-1] - toStateDesc = ', '.join([str(x) for x in toS]) + fromStateDesc = s[1:len(s) - 1] + toStateDesc = ', '.join([str(x) for x in toS]) tup = (stateMap[toState], toStateDesc, offset) if tup not in byAction: @@ -298,7 +297,7 @@ def main(): w('') w.outdent() w('// %d vectors; %d states per vector; array length = %d' % \ - (numVectors, numCasesPerVector, numVectors*numCasesPerVector)) + (numVectors, numCasesPerVector, numVectors * numCasesPerVector)) w.indent() if PACKED: # pack in python @@ -317,26 +316,26 @@ def main(): w(' private final static int[] offsetIncrs%d = new int[] %s;' % \ (i, renderList([str(x) for x in toStateArray]))) w.outdent() - - stateMap2 = dict([[v,k] for k,v in stateMap.items()]) + + stateMap2 = dict([[v, k] for k, v in stateMap.items()]) w('') w('// state map') sum = 0 minErrors = [] - for i in xrange(len(stateMap2)-1): + for i in xrange(len(stateMap2) - 1): w('// %s -> %s' % (i, stateMap2[i])) # we replace t-notation as it's not relevant here st = stateMap2[i].replace('t', '') - + v = eval(st) - minError = min([-i+e for i, e in v]) + minError = min([-i + e for i, e in v]) c = len(v) sum += c minErrors.append(minError) w('') w.indent() - #w('private final static int[] minErrors = new int[] {%s};' % ','.join([str(x) for x in minErrors])) + # w('private final static int[] minErrors = new int[] {%s};' % ','.join([str(x) for x in minErrors])) w.outdent() @@ -349,7 +348,7 @@ def main(): w('') w('@Override') w('public int size() { // this can now move up?') - w(' return %d*(w+1);' % (len(stateMap2)-1)) + w(' return %d*(w+1);' % (len(stateMap2) - 1)) w('}') w('') @@ -381,7 +380,7 @@ def main(): v = 2 l = [] for i in range(63): - l.append(hex(v-1)) + l.append(hex(v - 1)) v *= 2 w('private final static long[] MASKS = new long[] {%s};' % ','.join(l), indent=1) @@ -391,7 +390,7 @@ def main(): w('private int unpack(long[] data, int index, int bitsPerValue) {') w(' final long bitLoc = bitsPerValue * index;') w(' final int dataLoc = (int) (bitLoc >> %d);' % LOG2_WORD) - w(' final int bitStart = (int) (bitLoc & %d);' % (WORD-1)) + w(' final int bitStart = (int) (bitLoc & %d);' % (WORD - 1)) w(' //System.out.println("index=" + index + " dataLoc=" + dataLoc + " bitStart=" + bitStart + " bitsPerV=" + bitsPerValue);') w(' if (bitStart + bitsPerValue <= %d) {' % WORD) w(' // not split') @@ -403,7 +402,7 @@ def main(): w(' ((data[1+dataLoc] & MASKS[bitsPerValue-part-1]) << part));', indent=1) w(' }') w('}') - + # class w('}') w('') @@ -417,7 +416,7 @@ def main(): open(fileOut, 'wb').write(s) print 'Wrote %s [%d lines; %.1f KB]' % \ - (fileOut, len(w.l), os.path.getsize(fileOut)/1024.) + (fileOut, len(w.l), os.path.getsize(fileOut) / 1024.) def renderList(l): lx = [' '] @@ -432,13 +431,13 @@ def renderList(l): MASKS = [] v = 2 for i in xrange(63): - MASKS.append(v-1) + MASKS.append(v - 1) v *= 2 # packs into longs; returns long[], numBits def pack(l): maxV = max(l) - bitsPerValue = max(1, int(math.ceil(math.log(maxV+1)/math.log(2.0)))) + bitsPerValue = max(1, int(math.ceil(math.log(maxV + 1) / math.log(2.0)))) bitsLeft = WORD pendingValue = 0 @@ -447,11 +446,11 @@ def pack(l): for i in xrange(len(l)): v = l[i] if pendingValue > 0: - bitsUsed = math.ceil(math.log(pendingValue)/math.log(2.0)) - assert bitsUsed <= (WORD-bitsLeft), 'bitsLeft=%s (%s-%s=%s) bitsUsed=%s' % (bitsLeft, WORD, bitsLeft, WORD-bitsLeft, bitsUsed) - + bitsUsed = math.ceil(math.log(pendingValue) / math.log(2.0)) + assert bitsUsed <= (WORD - bitsLeft), 'bitsLeft=%s (%s-%s=%s) bitsUsed=%s' % (bitsLeft, WORD, bitsLeft, WORD - bitsLeft, bitsUsed) + if bitsLeft >= bitsPerValue: - pendingValue += v << (WORD-bitsLeft) + pendingValue += v << (WORD - bitsLeft) bitsLeft -= bitsPerValue if bitsLeft == 0: packed.append(pendingValue) @@ -461,17 +460,17 @@ def pack(l): # split # bottom bitsLeft go in current word: - pendingValue += (v & MASKS[bitsLeft-1]) << (WORD-bitsLeft) + pendingValue += (v & MASKS[bitsLeft - 1]) << (WORD - bitsLeft) packed.append(pendingValue) pendingValue = v >> bitsLeft - bitsLeft = WORD - (bitsPerValue-bitsLeft) + bitsLeft = WORD - (bitsPerValue - bitsLeft) if bitsLeft < WORD: packed.append(pendingValue) # verify(l, packed, bitsPerValue) - + return packed, bitsPerValue def verify(data, packedData, bitsPerValue): @@ -481,16 +480,16 @@ def verify(data, packedData, bitsPerValue): def unpack(data, index, bitsPerValue): bitLoc = bitsPerValue * index dataLoc = int(bitLoc >> LOG2_WORD) - bitStart = int(bitLoc & (WORD-1)) + bitStart = int(bitLoc & (WORD - 1)) if bitStart + bitsPerValue <= WORD: # not split - return int(((data[dataLoc] >> bitStart) & MASKS[bitsPerValue-1])) + return int(((data[dataLoc] >> bitStart) & MASKS[bitsPerValue - 1])) else: # split - part = WORD-bitStart; - return int((((data[dataLoc] >> bitStart) & MASKS[part-1]) + - ((data[1+dataLoc] & MASKS[bitsPerValue-part-1]) << part))) - + part = WORD - bitStart; + return int((((data[dataLoc] >> bitStart) & MASKS[part - 1]) + + ((data[1 + dataLoc] & MASKS[bitsPerValue - part - 1]) << part))) + if __name__ == '__main__': if not __debug__: print diff --git a/lucene/core/src/java/org/apache/lucene/util/bkd/BKDReader.java b/lucene/core/src/java/org/apache/lucene/util/bkd/BKDReader.java index 81b9814c64d..8a3986eb9ba 100644 --- a/lucene/core/src/java/org/apache/lucene/util/bkd/BKDReader.java +++ b/lucene/core/src/java/org/apache/lucene/util/bkd/BKDReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.bkd; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.bkd; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.bkd; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/util/bkd/BKDWriter.java b/lucene/core/src/java/org/apache/lucene/util/bkd/BKDWriter.java index e47830db94d..0d3f8fce570 100644 --- a/lucene/core/src/java/org/apache/lucene/util/bkd/BKDWriter.java +++ b/lucene/core/src/java/org/apache/lucene/util/bkd/BKDWriter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.bkd; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.bkd; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.bkd; + import java.io.Closeable; import java.io.EOFException; diff --git a/lucene/core/src/java/org/apache/lucene/util/bkd/HeapPointReader.java b/lucene/core/src/java/org/apache/lucene/util/bkd/HeapPointReader.java index b4f0bbe8aa5..081360b3658 100644 --- a/lucene/core/src/java/org/apache/lucene/util/bkd/HeapPointReader.java +++ b/lucene/core/src/java/org/apache/lucene/util/bkd/HeapPointReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.bkd; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.bkd; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.bkd; + import java.util.List; diff --git a/lucene/core/src/java/org/apache/lucene/util/bkd/HeapPointWriter.java b/lucene/core/src/java/org/apache/lucene/util/bkd/HeapPointWriter.java index bea8d981ae9..ae247c942b9 100644 --- a/lucene/core/src/java/org/apache/lucene/util/bkd/HeapPointWriter.java +++ b/lucene/core/src/java/org/apache/lucene/util/bkd/HeapPointWriter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.bkd; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.bkd; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.bkd; + import java.util.ArrayList; import java.util.List; diff --git a/lucene/core/src/java/org/apache/lucene/util/bkd/OfflinePointReader.java b/lucene/core/src/java/org/apache/lucene/util/bkd/OfflinePointReader.java index 57b28a9dbc6..ad8523898c0 100644 --- a/lucene/core/src/java/org/apache/lucene/util/bkd/OfflinePointReader.java +++ b/lucene/core/src/java/org/apache/lucene/util/bkd/OfflinePointReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.bkd; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.bkd; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.bkd; + import java.io.EOFException; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/util/bkd/OfflinePointWriter.java b/lucene/core/src/java/org/apache/lucene/util/bkd/OfflinePointWriter.java index 6cf10974da7..a4a9f7c66d5 100644 --- a/lucene/core/src/java/org/apache/lucene/util/bkd/OfflinePointWriter.java +++ b/lucene/core/src/java/org/apache/lucene/util/bkd/OfflinePointWriter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.bkd; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.bkd; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.bkd; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/util/bkd/PointReader.java b/lucene/core/src/java/org/apache/lucene/util/bkd/PointReader.java index 2b7576f9ee8..fe7a9612426 100644 --- a/lucene/core/src/java/org/apache/lucene/util/bkd/PointReader.java +++ b/lucene/core/src/java/org/apache/lucene/util/bkd/PointReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.bkd; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.bkd; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.bkd; + import java.io.Closeable; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/util/bkd/PointWriter.java b/lucene/core/src/java/org/apache/lucene/util/bkd/PointWriter.java index a732ee9264a..4cdf4349578 100644 --- a/lucene/core/src/java/org/apache/lucene/util/bkd/PointWriter.java +++ b/lucene/core/src/java/org/apache/lucene/util/bkd/PointWriter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.bkd; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.bkd; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.bkd; + import java.io.Closeable; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/util/bkd/package-info.java b/lucene/core/src/java/org/apache/lucene/util/bkd/package-info.java index 85dec5a3d20..d824ffebe98 100644 --- a/lucene/core/src/java/org/apache/lucene/util/bkd/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/util/bkd/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Block KD-tree, implementing the generic spatial data structure described in * this paper. diff --git a/lucene/core/src/java/org/apache/lucene/util/fst/Builder.java b/lucene/core/src/java/org/apache/lucene/util/fst/Builder.java index 849371f005a..dfa6eb1465d 100644 --- a/lucene/core/src/java/org/apache/lucene/util/fst/Builder.java +++ b/lucene/core/src/java/org/apache/lucene/util/fst/Builder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.fst; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.fst; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.fst; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/util/fst/ByteSequenceOutputs.java b/lucene/core/src/java/org/apache/lucene/util/fst/ByteSequenceOutputs.java index 789a808feda..70f468006e2 100644 --- a/lucene/core/src/java/org/apache/lucene/util/fst/ByteSequenceOutputs.java +++ b/lucene/core/src/java/org/apache/lucene/util/fst/ByteSequenceOutputs.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.fst; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.fst; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.fst; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/util/fst/BytesRefFSTEnum.java b/lucene/core/src/java/org/apache/lucene/util/fst/BytesRefFSTEnum.java index 9fc1ee1a9f2..97d6a0eb357 100644 --- a/lucene/core/src/java/org/apache/lucene/util/fst/BytesRefFSTEnum.java +++ b/lucene/core/src/java/org/apache/lucene/util/fst/BytesRefFSTEnum.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.fst; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.fst; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.fst; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/util/fst/BytesStore.java b/lucene/core/src/java/org/apache/lucene/util/fst/BytesStore.java index 9a7cca705c3..96f5732dd56 100644 --- a/lucene/core/src/java/org/apache/lucene/util/fst/BytesStore.java +++ b/lucene/core/src/java/org/apache/lucene/util/fst/BytesStore.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.fst; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.fst; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.fst; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/java/org/apache/lucene/util/fst/CharSequenceOutputs.java b/lucene/core/src/java/org/apache/lucene/util/fst/CharSequenceOutputs.java index c7b18a189c5..6529adaba5c 100644 --- a/lucene/core/src/java/org/apache/lucene/util/fst/CharSequenceOutputs.java +++ b/lucene/core/src/java/org/apache/lucene/util/fst/CharSequenceOutputs.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.fst; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.fst; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.fst; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/util/fst/FST.java b/lucene/core/src/java/org/apache/lucene/util/fst/FST.java index 88cbf7c40f2..4a0a3a92cf6 100644 --- a/lucene/core/src/java/org/apache/lucene/util/fst/FST.java +++ b/lucene/core/src/java/org/apache/lucene/util/fst/FST.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.fst; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.fst; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.fst; + import java.io.BufferedInputStream; import java.io.BufferedOutputStream; diff --git a/lucene/core/src/java/org/apache/lucene/util/fst/FSTEnum.java b/lucene/core/src/java/org/apache/lucene/util/fst/FSTEnum.java index d1f7a1a61ce..676d6eda0b5 100644 --- a/lucene/core/src/java/org/apache/lucene/util/fst/FSTEnum.java +++ b/lucene/core/src/java/org/apache/lucene/util/fst/FSTEnum.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.fst; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.fst; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.fst; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/util/fst/ForwardBytesReader.java b/lucene/core/src/java/org/apache/lucene/util/fst/ForwardBytesReader.java index 2365a02a4fc..9d450b8dd9e 100644 --- a/lucene/core/src/java/org/apache/lucene/util/fst/ForwardBytesReader.java +++ b/lucene/core/src/java/org/apache/lucene/util/fst/ForwardBytesReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.fst; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.fst; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.fst; + // TODO: can we use just ByteArrayDataInput...? need to // add a .skipBytes to DataInput.. hmm and .setPosition diff --git a/lucene/core/src/java/org/apache/lucene/util/fst/IntSequenceOutputs.java b/lucene/core/src/java/org/apache/lucene/util/fst/IntSequenceOutputs.java index f12104381b5..d10359e4ee7 100644 --- a/lucene/core/src/java/org/apache/lucene/util/fst/IntSequenceOutputs.java +++ b/lucene/core/src/java/org/apache/lucene/util/fst/IntSequenceOutputs.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.fst; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.fst; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.fst; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/util/fst/IntsRefFSTEnum.java b/lucene/core/src/java/org/apache/lucene/util/fst/IntsRefFSTEnum.java index 1a3efa9cfe2..f485854a748 100644 --- a/lucene/core/src/java/org/apache/lucene/util/fst/IntsRefFSTEnum.java +++ b/lucene/core/src/java/org/apache/lucene/util/fst/IntsRefFSTEnum.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.fst; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.fst; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.fst; + import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.IntsRef; diff --git a/lucene/core/src/java/org/apache/lucene/util/fst/NoOutputs.java b/lucene/core/src/java/org/apache/lucene/util/fst/NoOutputs.java index 91935a8146d..1d936e4bb0b 100644 --- a/lucene/core/src/java/org/apache/lucene/util/fst/NoOutputs.java +++ b/lucene/core/src/java/org/apache/lucene/util/fst/NoOutputs.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.fst; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.fst; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.fst; + import org.apache.lucene.store.DataInput; import org.apache.lucene.store.DataOutput; diff --git a/lucene/core/src/java/org/apache/lucene/util/fst/NodeHash.java b/lucene/core/src/java/org/apache/lucene/util/fst/NodeHash.java index d6c14829b19..6704cf67a68 100644 --- a/lucene/core/src/java/org/apache/lucene/util/fst/NodeHash.java +++ b/lucene/core/src/java/org/apache/lucene/util/fst/NodeHash.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.fst; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.fst; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.fst; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/util/fst/Outputs.java b/lucene/core/src/java/org/apache/lucene/util/fst/Outputs.java index fad2b6cb42a..be024a8b712 100644 --- a/lucene/core/src/java/org/apache/lucene/util/fst/Outputs.java +++ b/lucene/core/src/java/org/apache/lucene/util/fst/Outputs.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.fst; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.fst; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.fst; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/util/fst/PairOutputs.java b/lucene/core/src/java/org/apache/lucene/util/fst/PairOutputs.java index 1358e8235f8..b74cf289003 100644 --- a/lucene/core/src/java/org/apache/lucene/util/fst/PairOutputs.java +++ b/lucene/core/src/java/org/apache/lucene/util/fst/PairOutputs.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.fst; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.fst; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.fst; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/util/fst/PositiveIntOutputs.java b/lucene/core/src/java/org/apache/lucene/util/fst/PositiveIntOutputs.java index 83136b4b2fd..517a86c048b 100644 --- a/lucene/core/src/java/org/apache/lucene/util/fst/PositiveIntOutputs.java +++ b/lucene/core/src/java/org/apache/lucene/util/fst/PositiveIntOutputs.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.fst; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.fst; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.fst; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/util/fst/ReverseBytesReader.java b/lucene/core/src/java/org/apache/lucene/util/fst/ReverseBytesReader.java index 59d76f0d1c6..01341cf45ef 100644 --- a/lucene/core/src/java/org/apache/lucene/util/fst/ReverseBytesReader.java +++ b/lucene/core/src/java/org/apache/lucene/util/fst/ReverseBytesReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.fst; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.fst; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.fst; + /** Reads in reverse from a single byte[]. */ final class ReverseBytesReader extends FST.BytesReader { diff --git a/lucene/core/src/java/org/apache/lucene/util/fst/Util.java b/lucene/core/src/java/org/apache/lucene/util/fst/Util.java index 5dc8c9bdc62..341b8d07683 100644 --- a/lucene/core/src/java/org/apache/lucene/util/fst/Util.java +++ b/lucene/core/src/java/org/apache/lucene/util/fst/Util.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.fst; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.fst; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.fst; + import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; diff --git a/lucene/core/src/java/org/apache/lucene/util/fst/package-info.java b/lucene/core/src/java/org/apache/lucene/util/fst/package-info.java index 41426f96426..9fd4084780c 100644 --- a/lucene/core/src/java/org/apache/lucene/util/fst/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/util/fst/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Finite state transducers *

diff --git a/lucene/core/src/java/org/apache/lucene/util/mutable/package-info.java b/lucene/core/src/java/org/apache/lucene/util/mutable/package-info.java index 02ae5fcd686..15077eff11c 100644 --- a/lucene/core/src/java/org/apache/lucene/util/mutable/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/util/mutable/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Comparable object wrappers */ diff --git a/lucene/core/src/java/org/apache/lucene/util/package-info.java b/lucene/core/src/java/org/apache/lucene/util/package-info.java index be74639322a..66f4a107613 100644 --- a/lucene/core/src/java/org/apache/lucene/util/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/util/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Some utility classes. */ diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/AbstractBlockPackedWriter.java b/lucene/core/src/java/org/apache/lucene/util/packed/AbstractBlockPackedWriter.java index 8fc9a161a93..9a3a8a485e6 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/AbstractBlockPackedWriter.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/AbstractBlockPackedWriter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; + import static org.apache.lucene.util.packed.PackedInts.checkBlockSize; diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/AbstractPagedMutable.java b/lucene/core/src/java/org/apache/lucene/util/packed/AbstractPagedMutable.java index 9633183d9ad..13ab6f9db72 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/AbstractPagedMutable.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/AbstractPagedMutable.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; + import static org.apache.lucene.util.packed.PackedInts.checkBlockSize; import static org.apache.lucene.util.packed.PackedInts.numBlocks; diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/BlockPackedReader.java b/lucene/core/src/java/org/apache/lucene/util/packed/BlockPackedReader.java index bec5358eb26..82bf93f0f15 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/BlockPackedReader.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/BlockPackedReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; + import static org.apache.lucene.util.BitUtil.zigZagDecode; import static org.apache.lucene.util.packed.AbstractBlockPackedWriter.BPV_SHIFT; diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/BlockPackedReaderIterator.java b/lucene/core/src/java/org/apache/lucene/util/packed/BlockPackedReaderIterator.java index 2a7af3f26e2..512fa36a261 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/BlockPackedReaderIterator.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/BlockPackedReaderIterator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; + import static org.apache.lucene.util.BitUtil.zigZagDecode; import static org.apache.lucene.util.packed.AbstractBlockPackedWriter.BPV_SHIFT; diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/BlockPackedWriter.java b/lucene/core/src/java/org/apache/lucene/util/packed/BlockPackedWriter.java index cbc23122bc2..afe3ccfa450 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/BlockPackedWriter.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/BlockPackedWriter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; + import static org.apache.lucene.util.BitUtil.zigZagEncode; diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperation.java b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperation.java index 9e5c3dea570..98ff57c37b0 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperation.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperation.java @@ -1,7 +1,5 @@ // This file has been automatically generated, DO NOT EDIT -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +16,7 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; /** diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked.java b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked.java index 750515a6082..89968fd1dcf 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked.java @@ -1,6 +1,3 @@ -package org.apache.lucene.util.packed; - - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +14,9 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; + + /** * Non-specialized {@link BulkOperation} for {@link PackedInts.Format#PACKED}. diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked1.java b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked1.java index 7e06f637d20..672745d8616 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked1.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked1.java @@ -1,7 +1,5 @@ // This file has been automatically generated, DO NOT EDIT -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +16,7 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; /** * Efficient sequential read/write of packed integers. diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked10.java b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked10.java index 520c15ad1f9..90135f1da36 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked10.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked10.java @@ -1,7 +1,5 @@ // This file has been automatically generated, DO NOT EDIT -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +16,7 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; /** * Efficient sequential read/write of packed integers. diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked11.java b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked11.java index a2b34a71e60..c6013325790 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked11.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked11.java @@ -1,7 +1,5 @@ // This file has been automatically generated, DO NOT EDIT -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +16,7 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; /** * Efficient sequential read/write of packed integers. diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked12.java b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked12.java index 024691c2b0a..b3cb14d1d15 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked12.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked12.java @@ -1,7 +1,5 @@ // This file has been automatically generated, DO NOT EDIT -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +16,7 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; /** * Efficient sequential read/write of packed integers. diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked13.java b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked13.java index d6bd4ed118a..eca5c3a27dd 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked13.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked13.java @@ -1,7 +1,5 @@ // This file has been automatically generated, DO NOT EDIT -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +16,7 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; /** * Efficient sequential read/write of packed integers. diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked14.java b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked14.java index f80bd95d309..0a4ca6fd458 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked14.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked14.java @@ -1,7 +1,5 @@ // This file has been automatically generated, DO NOT EDIT -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +16,7 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; /** * Efficient sequential read/write of packed integers. diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked15.java b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked15.java index 54ca6bcc305..701c756db22 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked15.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked15.java @@ -1,7 +1,5 @@ // This file has been automatically generated, DO NOT EDIT -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +16,7 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; /** * Efficient sequential read/write of packed integers. diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked16.java b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked16.java index c1de1f80f1a..6db3d44311b 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked16.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked16.java @@ -1,7 +1,5 @@ // This file has been automatically generated, DO NOT EDIT -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +16,7 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; /** * Efficient sequential read/write of packed integers. diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked17.java b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked17.java index c767caf4017..f6dfefc683e 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked17.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked17.java @@ -1,7 +1,5 @@ // This file has been automatically generated, DO NOT EDIT -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +16,7 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; /** * Efficient sequential read/write of packed integers. diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked18.java b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked18.java index fc2ac64dd48..36cb5bc3e48 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked18.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked18.java @@ -1,7 +1,5 @@ // This file has been automatically generated, DO NOT EDIT -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +16,7 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; /** * Efficient sequential read/write of packed integers. diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked19.java b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked19.java index 49640bfb68b..43941b334b9 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked19.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked19.java @@ -1,7 +1,5 @@ // This file has been automatically generated, DO NOT EDIT -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +16,7 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; /** * Efficient sequential read/write of packed integers. diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked2.java b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked2.java index 03e250b6560..7ce97ab4396 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked2.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked2.java @@ -1,7 +1,5 @@ // This file has been automatically generated, DO NOT EDIT -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +16,7 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; /** * Efficient sequential read/write of packed integers. diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked20.java b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked20.java index fc7e389b52a..3d3862a7d91 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked20.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked20.java @@ -1,7 +1,5 @@ // This file has been automatically generated, DO NOT EDIT -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +16,7 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; /** * Efficient sequential read/write of packed integers. diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked21.java b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked21.java index d98c499d18a..d38f173a495 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked21.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked21.java @@ -1,7 +1,5 @@ // This file has been automatically generated, DO NOT EDIT -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +16,7 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; /** * Efficient sequential read/write of packed integers. diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked22.java b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked22.java index ed4ccd06197..b2271634aae 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked22.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked22.java @@ -1,7 +1,5 @@ // This file has been automatically generated, DO NOT EDIT -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +16,7 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; /** * Efficient sequential read/write of packed integers. diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked23.java b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked23.java index c0aad0e0e51..7a80c3a2dd7 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked23.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked23.java @@ -1,7 +1,5 @@ // This file has been automatically generated, DO NOT EDIT -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +16,7 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; /** * Efficient sequential read/write of packed integers. diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked24.java b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked24.java index d23d91f00b6..60b3b151588 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked24.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked24.java @@ -1,7 +1,5 @@ // This file has been automatically generated, DO NOT EDIT -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +16,7 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; /** * Efficient sequential read/write of packed integers. diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked3.java b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked3.java index da0a9ad48b8..862a70feff4 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked3.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked3.java @@ -1,7 +1,5 @@ // This file has been automatically generated, DO NOT EDIT -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +16,7 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; /** * Efficient sequential read/write of packed integers. diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked4.java b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked4.java index a67080a2095..30c61b80419 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked4.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked4.java @@ -1,7 +1,5 @@ // This file has been automatically generated, DO NOT EDIT -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +16,7 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; /** * Efficient sequential read/write of packed integers. diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked5.java b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked5.java index da827ebdc00..ddb435d7472 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked5.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked5.java @@ -1,7 +1,5 @@ // This file has been automatically generated, DO NOT EDIT -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +16,7 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; /** * Efficient sequential read/write of packed integers. diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked6.java b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked6.java index aedd63ca9e1..174a37a0850 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked6.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked6.java @@ -1,7 +1,5 @@ // This file has been automatically generated, DO NOT EDIT -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +16,7 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; /** * Efficient sequential read/write of packed integers. diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked7.java b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked7.java index 3629e58ea95..18d015669aa 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked7.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked7.java @@ -1,7 +1,5 @@ // This file has been automatically generated, DO NOT EDIT -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +16,7 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; /** * Efficient sequential read/write of packed integers. diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked8.java b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked8.java index f9833fed502..03421fad501 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked8.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked8.java @@ -1,7 +1,5 @@ // This file has been automatically generated, DO NOT EDIT -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +16,7 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; /** * Efficient sequential read/write of packed integers. diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked9.java b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked9.java index f763b5503f0..60632b6b481 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked9.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked9.java @@ -1,7 +1,5 @@ // This file has been automatically generated, DO NOT EDIT -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +16,7 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; /** * Efficient sequential read/write of packed integers. diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock.java b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock.java index 0755a9df4b4..c4dfe9f3d98 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; + /** * Non-specialized {@link BulkOperation} for {@link PackedInts.Format#PACKED_SINGLE_BLOCK}. diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/DeltaPackedLongValues.java b/lucene/core/src/java/org/apache/lucene/util/packed/DeltaPackedLongValues.java index ade1e6ae73b..80534da8902 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/DeltaPackedLongValues.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/DeltaPackedLongValues.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; + import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/Direct16.java b/lucene/core/src/java/org/apache/lucene/util/packed/Direct16.java index ea35b0685bd..82281a9e0e7 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/Direct16.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/Direct16.java @@ -1,7 +1,5 @@ // This file has been automatically generated, DO NOT EDIT -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +16,7 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; import org.apache.lucene.store.DataInput; import org.apache.lucene.util.RamUsageEstimator; @@ -42,6 +41,11 @@ final class Direct16 extends PackedInts.MutableImpl { for (int i = 0; i < valueCount; ++i) { values[i] = in.readShort(); } + // because packed ints have not always been byte-aligned + final int remaining = (int) (PackedInts.Format.PACKED.byteCount(packedIntsVersion, valueCount, 16) - 2L * valueCount); + for (int i = 0; i < remaining; ++i) { + in.readByte(); + } } @Override diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/Direct32.java b/lucene/core/src/java/org/apache/lucene/util/packed/Direct32.java index 61d997e87b1..502aa3f3d6a 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/Direct32.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/Direct32.java @@ -1,7 +1,5 @@ // This file has been automatically generated, DO NOT EDIT -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +16,7 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; import org.apache.lucene.store.DataInput; import org.apache.lucene.util.RamUsageEstimator; @@ -42,6 +41,11 @@ final class Direct32 extends PackedInts.MutableImpl { for (int i = 0; i < valueCount; ++i) { values[i] = in.readInt(); } + // because packed ints have not always been byte-aligned + final int remaining = (int) (PackedInts.Format.PACKED.byteCount(packedIntsVersion, valueCount, 32) - 4L * valueCount); + for (int i = 0; i < remaining; ++i) { + in.readByte(); + } } @Override diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/Direct64.java b/lucene/core/src/java/org/apache/lucene/util/packed/Direct64.java index 5a1696441f8..106f641f8cb 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/Direct64.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/Direct64.java @@ -1,7 +1,5 @@ // This file has been automatically generated, DO NOT EDIT -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +16,7 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; import org.apache.lucene.store.DataInput; import org.apache.lucene.util.RamUsageEstimator; diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/Direct8.java b/lucene/core/src/java/org/apache/lucene/util/packed/Direct8.java index e0871724f8e..27986c013f4 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/Direct8.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/Direct8.java @@ -1,7 +1,5 @@ // This file has been automatically generated, DO NOT EDIT -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +16,7 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; import org.apache.lucene.store.DataInput; import org.apache.lucene.util.RamUsageEstimator; @@ -40,6 +39,11 @@ final class Direct8 extends PackedInts.MutableImpl { Direct8(int packedIntsVersion, DataInput in, int valueCount) throws IOException { this(valueCount); in.readBytes(values, 0, valueCount); + // because packed ints have not always been byte-aligned + final int remaining = (int) (PackedInts.Format.PACKED.byteCount(packedIntsVersion, valueCount, 8) - 1L * valueCount); + for (int i = 0; i < remaining; ++i) { + in.readByte(); + } } @Override diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/DirectMonotonicReader.java b/lucene/core/src/java/org/apache/lucene/util/packed/DirectMonotonicReader.java index 836ee50be4b..bdefdf367c8 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/DirectMonotonicReader.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/DirectMonotonicReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/DirectMonotonicWriter.java b/lucene/core/src/java/org/apache/lucene/util/packed/DirectMonotonicWriter.java index 1ff5dedfb61..970e3ff1833 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/DirectMonotonicWriter.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/DirectMonotonicWriter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/DirectPacked64SingleBlockReader.java b/lucene/core/src/java/org/apache/lucene/util/packed/DirectPacked64SingleBlockReader.java index dac9b020c49..2062d2c48f2 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/DirectPacked64SingleBlockReader.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/DirectPacked64SingleBlockReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/DirectPackedReader.java b/lucene/core/src/java/org/apache/lucene/util/packed/DirectPackedReader.java index c6e315d3405..bc972424909 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/DirectPackedReader.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/DirectPackedReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; + import org.apache.lucene.store.IndexInput; diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/DirectReader.java b/lucene/core/src/java/org/apache/lucene/util/packed/DirectReader.java index 81e2484b406..a0949505af1 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/DirectReader.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/DirectReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/DirectWriter.java b/lucene/core/src/java/org/apache/lucene/util/packed/DirectWriter.java index 85c7c47aa35..9a7f18eb26f 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/DirectWriter.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/DirectWriter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; + import java.io.EOFException; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/GrowableWriter.java b/lucene/core/src/java/org/apache/lucene/util/packed/GrowableWriter.java index f8983695f0b..76d3ecca4a6 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/GrowableWriter.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/GrowableWriter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/MonotonicBlockPackedReader.java b/lucene/core/src/java/org/apache/lucene/util/packed/MonotonicBlockPackedReader.java index 298aca0105b..44de758d8a0 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/MonotonicBlockPackedReader.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/MonotonicBlockPackedReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; + import static org.apache.lucene.util.packed.AbstractBlockPackedWriter.MAX_BLOCK_SIZE; import static org.apache.lucene.util.packed.AbstractBlockPackedWriter.MIN_BLOCK_SIZE; diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/MonotonicBlockPackedWriter.java b/lucene/core/src/java/org/apache/lucene/util/packed/MonotonicBlockPackedWriter.java index eb3a0162e97..8652f25a1fb 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/MonotonicBlockPackedWriter.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/MonotonicBlockPackedWriter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; + import static org.apache.lucene.util.BitUtil.zigZagEncode; import static org.apache.lucene.util.packed.MonotonicBlockPackedReader.expected; diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/MonotonicLongValues.java b/lucene/core/src/java/org/apache/lucene/util/packed/MonotonicLongValues.java index 54e9d8c7d3e..6d396a26d3b 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/MonotonicLongValues.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/MonotonicLongValues.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; + import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/Packed16ThreeBlocks.java b/lucene/core/src/java/org/apache/lucene/util/packed/Packed16ThreeBlocks.java index b8eb4e9d556..8e8e94d17ea 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/Packed16ThreeBlocks.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/Packed16ThreeBlocks.java @@ -1,7 +1,5 @@ // This file has been automatically generated, DO NOT EDIT -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +16,7 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; import org.apache.lucene.store.DataInput; import org.apache.lucene.util.RamUsageEstimator; diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/Packed64.java b/lucene/core/src/java/org/apache/lucene/util/packed/Packed64.java index 79916477655..ae43032175f 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/Packed64.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/Packed64.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/Packed64SingleBlock.java b/lucene/core/src/java/org/apache/lucene/util/packed/Packed64SingleBlock.java index 09eb6697454..a7262b3ed90 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/Packed64SingleBlock.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/Packed64SingleBlock.java @@ -1,7 +1,5 @@ // This file has been automatically generated, DO NOT EDIT -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with this @@ -18,6 +16,7 @@ package org.apache.lucene.util.packed; * License for the specific language governing permissions and limitations under * the License. */ +package org.apache.lucene.util.packed; import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/Packed8ThreeBlocks.java b/lucene/core/src/java/org/apache/lucene/util/packed/Packed8ThreeBlocks.java index d480fa0f461..5a85735b3bb 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/Packed8ThreeBlocks.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/Packed8ThreeBlocks.java @@ -1,7 +1,5 @@ // This file has been automatically generated, DO NOT EDIT -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +16,7 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; import org.apache.lucene.store.DataInput; import org.apache.lucene.util.RamUsageEstimator; diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/PackedDataInput.java b/lucene/core/src/java/org/apache/lucene/util/packed/PackedDataInput.java index 87a4c570b3f..954449b3b9e 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/PackedDataInput.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/PackedDataInput.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/PackedDataOutput.java b/lucene/core/src/java/org/apache/lucene/util/packed/PackedDataOutput.java index e750526a30a..44410f8abe6 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/PackedDataOutput.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/PackedDataOutput.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; + import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/PackedInts.java b/lucene/core/src/java/org/apache/lucene/util/packed/PackedInts.java index 86a991bcfc0..4df85801fe1 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/PackedInts.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/PackedInts.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/PackedLongValues.java b/lucene/core/src/java/org/apache/lucene/util/packed/PackedLongValues.java index 2a46fa58056..0daf0623f90 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/PackedLongValues.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/PackedLongValues.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; + import static org.apache.lucene.util.packed.PackedInts.checkBlockSize; diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/PackedReaderIterator.java b/lucene/core/src/java/org/apache/lucene/util/packed/PackedReaderIterator.java index 198382d9a2e..798325b6044 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/PackedReaderIterator.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/PackedReaderIterator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; + import java.io.EOFException; import java.io.IOException; diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/PackedWriter.java b/lucene/core/src/java/org/apache/lucene/util/packed/PackedWriter.java index 63b3cbe3a94..88533488407 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/PackedWriter.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/PackedWriter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; + import org.apache.lucene.store.DataOutput; diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/PagedGrowableWriter.java b/lucene/core/src/java/org/apache/lucene/util/packed/PagedGrowableWriter.java index 7a3a4cb3e4a..ab6c65aa22c 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/PagedGrowableWriter.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/PagedGrowableWriter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; + import org.apache.lucene.util.RamUsageEstimator; import org.apache.lucene.util.packed.PackedInts.Mutable; diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/PagedMutable.java b/lucene/core/src/java/org/apache/lucene/util/packed/PagedMutable.java index 69e7619222d..fe75fe7f6db 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/PagedMutable.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/PagedMutable.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; + import org.apache.lucene.util.RamUsageEstimator; import org.apache.lucene.util.packed.PackedInts.Mutable; diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/gen_BulkOperation.py b/lucene/core/src/java/org/apache/lucene/util/packed/gen_BulkOperation.py index ea904a2ba1c..e01776cc57e 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/gen_BulkOperation.py +++ b/lucene/core/src/java/org/apache/lucene/util/packed/gen_BulkOperation.py @@ -24,8 +24,6 @@ PACKED_64_SINGLE_BLOCK_BPV = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 16, 21, 32] OUTPUT_FILE = "BulkOperation.java" HEADER = """// This file has been automatically generated, DO NOT EDIT -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -42,10 +40,11 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; """ -FOOTER=""" +FOOTER = """ protected int writeLong(long block, byte[] blocks, int blocksOffset) { for (int j = 1; j <= 8; ++j) { blocks[blocksOffset++] = (byte) (block >>> (64 - (j << 3))); @@ -90,7 +89,7 @@ def is_power_of_two(n): return n & (n - 1) == 0 def casts(typ): - cast_start = "(%s) (" %typ + cast_start = "(%s) (" % typ cast_end = ")" if typ == "long": cast_start = "" @@ -107,7 +106,7 @@ def hexNoLSuffix(n): def masks(bits): if bits == 64: return "", "" - return "(", " & %sL)" %(hexNoLSuffix((1 << bits) - 1)) + return "(", " & %sL)" % (hexNoLSuffix((1 << bits) - 1)) def get_type(bits): if bits == 8: @@ -127,15 +126,15 @@ def block_value_count(bpv, bits=64): while blocks % 2 == 0 and values % 2 == 0: blocks /= 2 values /= 2 - assert values * bpv == bits * blocks, "%d values, %d blocks, %d bits per value" %(values, blocks, bpv) + assert values * bpv == bits * blocks, "%d values, %d blocks, %d bits per value" % (values, blocks, bpv) return (blocks, values) def packed64(bpv, f): mask = (1 << bpv) - 1 f.write("\n") - f.write(" public BulkOperationPacked%d() {\n" %bpv) - f.write(" super(%d);\n" %bpv) + f.write(" public BulkOperationPacked%d() {\n" % bpv) + f.write(" super(%d);\n" % bpv) f.write(" }\n\n") if bpv == 64: @@ -169,7 +168,7 @@ def p64_decode(bpv, f, bits): cast_start, cast_end = casts(typ) f.write(" @Override\n") - f.write(" public void decode(long[] blocks, int blocksOffset, %s[] values, int valuesOffset, int iterations) {\n" %typ) + f.write(" public void decode(long[] blocks, int blocksOffset, %s[] values, int valuesOffset, int iterations) {\n" % typ) if bits < bpv: f.write(" throw new UnsupportedOperationException();\n") else: @@ -178,37 +177,37 @@ def p64_decode(bpv, f, bits): if is_power_of_two(bpv): f.write(" final long block = blocks[blocksOffset++];\n") - f.write(" for (int shift = %d; shift >= 0; shift -= %d) {\n" %(64 - bpv, bpv)) - f.write(" values[valuesOffset++] = %s(block >>> shift) & %d%s;\n" %(cast_start, mask, cast_end)) - f.write(" }\n") + f.write(" for (int shift = %d; shift >= 0; shift -= %d) {\n" % (64 - bpv, bpv)) + f.write(" values[valuesOffset++] = %s(block >>> shift) & %d%s;\n" % (cast_start, mask, cast_end)) + f.write(" }\n") else: for i in xrange(0, values): block_offset = i * bpv / 64 bit_offset = (i * bpv) % 64 if bit_offset == 0: # start of block - f.write(" final long block%d = blocks[blocksOffset++];\n" %block_offset); - f.write(" values[valuesOffset++] = %sblock%d >>> %d%s;\n" %(cast_start, block_offset, 64 - bpv, cast_end)) + f.write(" final long block%d = blocks[blocksOffset++];\n" % block_offset); + f.write(" values[valuesOffset++] = %sblock%d >>> %d%s;\n" % (cast_start, block_offset, 64 - bpv, cast_end)) elif bit_offset + bpv == 64: # end of block - f.write(" values[valuesOffset++] = %sblock%d & %dL%s;\n" %(cast_start, block_offset, mask, cast_end)) + f.write(" values[valuesOffset++] = %sblock%d & %dL%s;\n" % (cast_start, block_offset, mask, cast_end)) elif bit_offset + bpv < 64: # middle of block - f.write(" values[valuesOffset++] = %s(block%d >>> %d) & %dL%s;\n" %(cast_start, block_offset, 64 - bit_offset - bpv, mask, cast_end)) + f.write(" values[valuesOffset++] = %s(block%d >>> %d) & %dL%s;\n" % (cast_start, block_offset, 64 - bit_offset - bpv, mask, cast_end)) else: # value spans across 2 blocks - mask1 = (1 << (64 - bit_offset)) -1 + mask1 = (1 << (64 - bit_offset)) - 1 shift1 = bit_offset + bpv - 64 shift2 = 64 - shift1 - f.write(" final long block%d = blocks[blocksOffset++];\n" %(block_offset + 1)); - f.write(" values[valuesOffset++] = %s((block%d & %dL) << %d) | (block%d >>> %d)%s;\n" %(cast_start, block_offset, mask1, shift1, block_offset + 1, shift2, cast_end)) + f.write(" final long block%d = blocks[blocksOffset++];\n" % (block_offset + 1)); + f.write(" values[valuesOffset++] = %s((block%d & %dL) << %d) | (block%d >>> %d)%s;\n" % (cast_start, block_offset, mask1, shift1, block_offset + 1, shift2, cast_end)) f.write(" }\n") f.write(" }\n\n") byte_blocks, byte_values = block_value_count(bpv, 8) f.write(" @Override\n") - f.write(" public void decode(byte[] blocks, int blocksOffset, %s[] values, int valuesOffset, int iterations) {\n" %typ) + f.write(" public void decode(byte[] blocks, int blocksOffset, %s[] values, int valuesOffset, int iterations) {\n" % typ) if bits < bpv: f.write(" throw new UnsupportedOperationException();\n") else: @@ -216,8 +215,8 @@ def p64_decode(bpv, f, bits): f.write(" for (int j = 0; j < iterations; ++j) {\n") f.write(" final byte block = blocks[blocksOffset++];\n") for shift in xrange(8 - bpv, 0, -bpv): - f.write(" values[valuesOffset++] = (block >>> %d) & %d;\n" %(shift, mask)) - f.write(" values[valuesOffset++] = block & %d;\n" %mask) + f.write(" values[valuesOffset++] = (block >>> %d) & %d;\n" % (shift, mask)) + f.write(" values[valuesOffset++] = block & %d;\n" % mask) f.write(" }\n") elif bpv == 8: f.write(" for (int j = 0; j < iterations; ++j) {\n") @@ -228,8 +227,8 @@ def p64_decode(bpv, f, bits): m = bits <= 32 and "0xFF" or "0xFFL" f.write(" values[valuesOffset++] =") for i in xrange(bpv / 8 - 1): - f.write(" ((blocks[blocksOffset++] & %s) << %d) |" %(m, bpv - 8)) - f.write(" (blocks[blocksOffset++] & %s);\n" %m) + f.write(" ((blocks[blocksOffset++] & %s) << %d) |" % (m, bpv - 8)) + f.write(" (blocks[blocksOffset++] & %s);\n" % m) f.write(" }\n") else: f.write(" for (int i = 0; i < iterations; ++i) {\n") @@ -240,32 +239,32 @@ def p64_decode(bpv, f, bits): bit_end = ((i + 1) * bpv - 1) % 8 shift = lambda b: 8 * (byte_end - b - 1) + 1 + bit_end if bit_start == 0: - f.write(" final %s byte%d = blocks[blocksOffset++] & 0xFF;\n" %(typ, byte_start)) + f.write(" final %s byte%d = blocks[blocksOffset++] & 0xFF;\n" % (typ, byte_start)) for b in xrange(byte_start + 1, byte_end + 1): - f.write(" final %s byte%d = blocks[blocksOffset++] & 0xFF;\n" %(typ, b)) + f.write(" final %s byte%d = blocks[blocksOffset++] & 0xFF;\n" % (typ, b)) f.write(" values[valuesOffset++] =") if byte_start == byte_end: if bit_start == 0: if bit_end == 7: - f.write(" byte%d" %byte_start) + f.write(" byte%d" % byte_start) else: - f.write(" byte%d >>> %d" %(byte_start, 7 - bit_end)) + f.write(" byte%d >>> %d" % (byte_start, 7 - bit_end)) else: if bit_end == 7: - f.write(" byte%d & %d" %(byte_start, 2 ** (8 - bit_start) - 1)) + f.write(" byte%d & %d" % (byte_start, 2 ** (8 - bit_start) - 1)) else: - f.write(" (byte%d >>> %d) & %d" %(byte_start, 7 - bit_end, 2 ** (bit_end - bit_start + 1) - 1)) + f.write(" (byte%d >>> %d) & %d" % (byte_start, 7 - bit_end, 2 ** (bit_end - bit_start + 1) - 1)) else: if bit_start == 0: - f.write(" (byte%d << %d)" %(byte_start, shift(byte_start))) + f.write(" (byte%d << %d)" % (byte_start, shift(byte_start))) else: - f.write(" ((byte%d & %d) << %d)" %(byte_start, 2 ** (8 - bit_start) - 1, shift(byte_start))) + f.write(" ((byte%d & %d) << %d)" % (byte_start, 2 ** (8 - bit_start) - 1, shift(byte_start))) for b in xrange(byte_start + 1, byte_end): - f.write(" | (byte%d << %d)" %(b, shift(b))) + f.write(" | (byte%d << %d)" % (b, shift(b))) if bit_end == 7: - f.write(" | byte%d" %byte_end) + f.write(" | byte%d" % byte_end) else: - f.write(" | (byte%d >>> %d)" %(byte_end, 7 - bit_end)) + f.write(" | (byte%d >>> %d)" % (byte_end, 7 - bit_end)) f.write(";\n") f.write(" }\n") f.write(" }\n\n") @@ -280,7 +279,7 @@ if __name__ == '__main__': f.write('abstract class BulkOperation implements PackedInts.Decoder, PackedInts.Encoder {\n') f.write(' private static final BulkOperation[] packedBulkOps = new BulkOperation[] {\n') - + for bpv in xrange(1, 65): if bpv > MAX_SPECIALIZED_BITS_PER_VALUE: f.write(' new BulkOperationPacked(%d),\n' % bpv) @@ -299,20 +298,20 @@ if __name__ == '__main__': f2.write('}\n') f2.close() f.write(' new BulkOperationPacked%d(),\n' % bpv) - + f.write(' };\n') f.write('\n') - + f.write(' // NOTE: this is sparse (some entries are null):\n') f.write(' private static final BulkOperation[] packedSingleBlockBulkOps = new BulkOperation[] {\n') - for bpv in xrange(1, max(PACKED_64_SINGLE_BLOCK_BPV)+1): + for bpv in xrange(1, max(PACKED_64_SINGLE_BLOCK_BPV) + 1): if bpv in PACKED_64_SINGLE_BLOCK_BPV: f.write(' new BulkOperationPackedSingleBlock(%d),\n' % bpv) else: f.write(' null,\n') f.write(' };\n') f.write('\n') - + f.write("\n") f.write(" public static BulkOperation of(PackedInts.Format format, int bitsPerValue) {\n") f.write(" switch (format) {\n") diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/gen_Direct.py b/lucene/core/src/java/org/apache/lucene/util/packed/gen_Direct.py index 346538e41dc..f8cd4b41cbe 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/gen_Direct.py +++ b/lucene/core/src/java/org/apache/lucene/util/packed/gen_Direct.py @@ -15,9 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -HEADER="""// This file has been automatically generated, DO NOT EDIT - -package org.apache.lucene.util.packed; +HEADER = """// This file has been automatically generated, DO NOT EDIT /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -35,6 +33,7 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; import org.apache.lucene.store.DataInput; import org.apache.lucene.util.RamUsageEstimator; @@ -51,31 +50,31 @@ CASTS = {8: "(byte) ", 16: "(short) ", 32: "(int) ", 64: ""} if __name__ == '__main__': for bpv in TYPES.keys(): type - f = open("Direct%d.java" %bpv, 'w') + f = open("Direct%d.java" % bpv, 'w') f.write(HEADER) f.write("""/** * Direct wrapping of %d-bits values to a backing array. * @lucene.internal - */\n""" %bpv) - f.write("final class Direct%d extends PackedInts.MutableImpl {\n" %bpv) - f.write(" final %s[] values;\n\n" %TYPES[bpv]) + */\n""" % bpv) + f.write("final class Direct%d extends PackedInts.MutableImpl {\n" % bpv) + f.write(" final %s[] values;\n\n" % TYPES[bpv]) - f.write(" Direct%d(int valueCount) {\n" %bpv) - f.write(" super(valueCount, %d);\n" %bpv) - f.write(" values = new %s[valueCount];\n" %TYPES[bpv]) + f.write(" Direct%d(int valueCount) {\n" % bpv) + f.write(" super(valueCount, %d);\n" % bpv) + f.write(" values = new %s[valueCount];\n" % TYPES[bpv]) f.write(" }\n\n") - f.write(" Direct%d(int packedIntsVersion, DataInput in, int valueCount) throws IOException {\n" %bpv) + f.write(" Direct%d(int packedIntsVersion, DataInput in, int valueCount) throws IOException {\n" % bpv) f.write(" this(valueCount);\n") if bpv == 8: f.write(" in.readBytes(values, 0, valueCount);\n") else: f.write(" for (int i = 0; i < valueCount; ++i) {\n") - f.write(" values[i] = in.read%s();\n" %TYPES[bpv].title()) + f.write(" values[i] = in.read%s();\n" % TYPES[bpv].title()) f.write(" }\n") if bpv != 64: f.write(" // because packed ints have not always been byte-aligned\n") - f.write(" final int remaining = (int) (PackedInts.Format.PACKED.byteCount(packedIntsVersion, valueCount, %d) - %dL * valueCount);\n" %(bpv, bpv / 8)) + f.write(" final int remaining = (int) (PackedInts.Format.PACKED.byteCount(packedIntsVersion, valueCount, %d) - %dL * valueCount);\n" % (bpv, bpv / 8)) f.write(" for (int i = 0; i < remaining; ++i) {\n") f.write(" in.readByte();\n") f.write(" }\n") @@ -105,7 +104,7 @@ if __name__ == '__main__': public void clear() { Arrays.fill(values, %s0L); } -""" %(MASKS[bpv], CASTS[bpv], CASTS[bpv])) +""" % (MASKS[bpv], CASTS[bpv], CASTS[bpv])) if bpv == 64: f.write(""" @@ -169,7 +168,7 @@ if __name__ == '__main__': assert val == (val%s); Arrays.fill(values, fromIndex, toIndex, %sval); } -""" %(MASKS[bpv], CASTS[bpv], MASKS[bpv], CASTS[bpv])) +""" % (MASKS[bpv], CASTS[bpv], MASKS[bpv], CASTS[bpv])) f.write("}\n") diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/gen_Packed64SingleBlock.py b/lucene/core/src/java/org/apache/lucene/util/packed/gen_Packed64SingleBlock.py index fb70caf3f68..e60bb7233af 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/gen_Packed64SingleBlock.py +++ b/lucene/core/src/java/org/apache/lucene/util/packed/gen_Packed64SingleBlock.py @@ -17,9 +17,7 @@ SUPPORTED_BITS_PER_VALUE = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 16, 21, 32] -HEADER="""// This file has been automatically generated, DO NOT EDIT - -package org.apache.lucene.util.packed; +HEADER = """// This file has been automatically generated, DO NOT EDIT /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -37,6 +35,7 @@ package org.apache.lucene.util.packed; * License for the specific language governing permissions and limitations under * the License. */ +package org.apache.lucene.util.packed; import java.io.IOException; import java.util.Arrays; @@ -234,7 +233,7 @@ abstract class Packed64SingleBlock extends PackedInts.MutableImpl { return reader; } -""" %(SUPPORTED_BITS_PER_VALUE[-1], ", ".join(map(str, SUPPORTED_BITS_PER_VALUE))) +""" % (SUPPORTED_BITS_PER_VALUE[-1], ", ".join(map(str, SUPPORTED_BITS_PER_VALUE))) FOOTER = "}" @@ -245,10 +244,10 @@ if __name__ == '__main__': f.write(" public static Packed64SingleBlock create(int valueCount, int bitsPerValue) {\n") f.write(" switch (bitsPerValue) {\n") for bpv in SUPPORTED_BITS_PER_VALUE: - f.write(" case %d:\n" %bpv) - f.write(" return new Packed64SingleBlock%d(valueCount);\n" %bpv) + f.write(" case %d:\n" % bpv) + f.write(" return new Packed64SingleBlock%d(valueCount);\n" % bpv) f.write(" default:\n") - f.write(" throw new IllegalArgumentException(\"Unsupported number of bits per value: \" + %d);\n" %bpv) + f.write(" throw new IllegalArgumentException(\"Unsupported number of bits per value: \" + %d);\n" % bpv) f.write(" }\n") f.write(" }\n\n") @@ -259,35 +258,35 @@ if __name__ == '__main__': if (1 << log_2) != bpv: log_2 = None - f.write(" static class Packed64SingleBlock%d extends Packed64SingleBlock {\n\n" %bpv) + f.write(" static class Packed64SingleBlock%d extends Packed64SingleBlock {\n\n" % bpv) - f.write(" Packed64SingleBlock%d(int valueCount) {\n" %bpv) - f.write(" super(valueCount, %d);\n" %bpv) + f.write(" Packed64SingleBlock%d(int valueCount) {\n" % bpv) + f.write(" super(valueCount, %d);\n" % bpv) f.write(" }\n\n") f.write(" @Override\n") f.write(" public long get(int index) {\n") if log_2 is not None: - f.write(" final int o = index >>> %d;\n" %(6 - log_2)) - f.write(" final int b = index & %d;\n" %((1 << (6 - log_2)) - 1)) - f.write(" final int shift = b << %d;\n" %log_2) + f.write(" final int o = index >>> %d;\n" % (6 - log_2)) + f.write(" final int b = index & %d;\n" % ((1 << (6 - log_2)) - 1)) + f.write(" final int shift = b << %d;\n" % log_2) else: - f.write(" final int o = index / %d;\n" %(64 / bpv)) - f.write(" final int b = index %% %d;\n" %(64 / bpv)) - f.write(" final int shift = b * %d;\n" %bpv) - f.write(" return (blocks[o] >>> shift) & %dL;\n" %((1 << bpv) - 1)) + f.write(" final int o = index / %d;\n" % (64 / bpv)) + f.write(" final int b = index %% %d;\n" % (64 / bpv)) + f.write(" final int shift = b * %d;\n" % bpv) + f.write(" return (blocks[o] >>> shift) & %dL;\n" % ((1 << bpv) - 1)) f.write(" }\n\n") f.write(" @Override\n") f.write(" public void set(int index, long value) {\n") if log_2 is not None: - f.write(" final int o = index >>> %d;\n" %(6 - log_2)) - f.write(" final int b = index & %d;\n" %((1 << (6 - log_2)) - 1)) - f.write(" final int shift = b << %d;\n" %log_2) + f.write(" final int o = index >>> %d;\n" % (6 - log_2)) + f.write(" final int b = index & %d;\n" % ((1 << (6 - log_2)) - 1)) + f.write(" final int shift = b << %d;\n" % log_2) else: - f.write(" final int o = index / %d;\n" %(64 / bpv)) - f.write(" final int b = index %% %d;\n" %(64 / bpv)) - f.write(" final int shift = b * %d;\n" %bpv) + f.write(" final int o = index / %d;\n" % (64 / bpv)) + f.write(" final int b = index %% %d;\n" % (64 / bpv)) + f.write(" final int shift = b * %d;\n" % bpv) f.write(" blocks[o] = (blocks[o] & ~(%dL << shift)) | (value << shift);\n" % ((1 << bpv) - 1)) f.write(" }\n\n") f.write(" }\n\n") diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/gen_PackedThreeBlocks.py b/lucene/core/src/java/org/apache/lucene/util/packed/gen_PackedThreeBlocks.py index e057f4e1976..c3a1770613c 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/gen_PackedThreeBlocks.py +++ b/lucene/core/src/java/org/apache/lucene/util/packed/gen_PackedThreeBlocks.py @@ -15,9 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -HEADER="""// This file has been automatically generated, DO NOT EDIT - -package org.apache.lucene.util.packed; +HEADER = """// This file has been automatically generated, DO NOT EDIT /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -35,6 +33,7 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; import org.apache.lucene.store.DataInput; import org.apache.lucene.util.RamUsageEstimator; @@ -51,32 +50,32 @@ CASTS = {8: "(byte) ", 16: "(short) ", 32: "(int) ", 64: ""} if __name__ == '__main__': for bpv in TYPES.keys(): type - f = open("Packed%dThreeBlocks.java" %bpv, 'w') + f = open("Packed%dThreeBlocks.java" % bpv, 'w') f.write(HEADER) f.write("""/** * Packs integers into 3 %ss (%d bits per value). * @lucene.internal - */\n""" %(TYPES[bpv], bpv*3)) - f.write("final class Packed%dThreeBlocks extends PackedInts.MutableImpl {\n" %bpv) - f.write(" final %s[] blocks;\n\n" %TYPES[bpv]) + */\n""" % (TYPES[bpv], bpv * 3)) + f.write("final class Packed%dThreeBlocks extends PackedInts.MutableImpl {\n" % bpv) + f.write(" final %s[] blocks;\n\n" % TYPES[bpv]) f.write(" public static final int MAX_SIZE = Integer.MAX_VALUE / 3;\n\n") - f.write(" Packed%dThreeBlocks(int valueCount) {\n" %bpv) - f.write(" super(valueCount, %d);\n" %(bpv*3)) + f.write(" Packed%dThreeBlocks(int valueCount) {\n" % bpv) + f.write(" super(valueCount, %d);\n" % (bpv * 3)) f.write(" if (valueCount > MAX_SIZE) {\n") f.write(" throw new ArrayIndexOutOfBoundsException(\"MAX_SIZE exceeded\");\n") f.write(" }\n") - f.write(" blocks = new %s[valueCount * 3];\n" %TYPES[bpv]) + f.write(" blocks = new %s[valueCount * 3];\n" % TYPES[bpv]) f.write(" }\n\n") - f.write(" Packed%dThreeBlocks(int packedIntsVersion, DataInput in, int valueCount) throws IOException {\n" %bpv) + f.write(" Packed%dThreeBlocks(int packedIntsVersion, DataInput in, int valueCount) throws IOException {\n" % bpv) f.write(" this(valueCount);\n") if bpv == 8: f.write(" in.readBytes(blocks, 0, 3 * valueCount);\n") else: f.write(" for (int i = 0; i < 3 * valueCount; ++i) {\n") - f.write(" blocks[i] = in.read%s();\n" %TYPES[bpv].title()) + f.write(" blocks[i] = in.read%s();\n" % TYPES[bpv].title()) f.write(" }\n") f.write(" }\n") @@ -156,8 +155,8 @@ if __name__ == '__main__': + ",size=" + size() + ",blocks=" + blocks.length + ")"; } } -""" %(MASKS[bpv], 2*bpv, MASKS[bpv], bpv, MASKS[bpv], MASKS[bpv], 2*bpv, MASKS[bpv], bpv, MASKS[bpv], CASTS[bpv], 2*bpv, CASTS[bpv], bpv, CASTS[bpv], CASTS[bpv], - 2*bpv, CASTS[bpv], bpv, CASTS[bpv], TYPES[bpv], CASTS[bpv], 2*bpv, TYPES[bpv], +""" % (MASKS[bpv], 2 * bpv, MASKS[bpv], bpv, MASKS[bpv], MASKS[bpv], 2 * bpv, MASKS[bpv], bpv, MASKS[bpv], CASTS[bpv], 2 * bpv, CASTS[bpv], bpv, CASTS[bpv], CASTS[bpv], + 2 * bpv, CASTS[bpv], bpv, CASTS[bpv], TYPES[bpv], CASTS[bpv], 2 * bpv, TYPES[bpv], CASTS[bpv], bpv, TYPES[bpv], CASTS[bpv], CASTS[bpv])) f.close() diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/package-info.java b/lucene/core/src/java/org/apache/lucene/util/packed/package-info.java index 0365f772f55..cb6554c0f8c 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Packed integer arrays and streams. * diff --git a/lucene/core/src/test/org/apache/lucene/TestAssertions.java b/lucene/core/src/test/org/apache/lucene/TestAssertions.java index 551acc46041..808c44c42a1 100644 --- a/lucene/core/src/test/org/apache/lucene/TestAssertions.java +++ b/lucene/core/src/test/org/apache/lucene/TestAssertions.java @@ -1,5 +1,3 @@ -package org.apache.lucene; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene; + import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/TestDemo.java b/lucene/core/src/test/org/apache/lucene/TestDemo.java index 2647c3bd408..b4778d9ed6a 100644 --- a/lucene/core/src/test/org/apache/lucene/TestDemo.java +++ b/lucene/core/src/test/org/apache/lucene/TestDemo.java @@ -1,5 +1,3 @@ -package org.apache.lucene; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java b/lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java index 23c701f7ae2..2795679d0f3 100644 --- a/lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java +++ b/lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java @@ -1,5 +1,3 @@ -package org.apache.lucene; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene; + import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.PostingsFormat; diff --git a/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java b/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java index 3968a19e0eb..241e966c8e8 100644 --- a/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java +++ b/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java @@ -1,5 +1,3 @@ -package org.apache.lucene; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene; + import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; diff --git a/lucene/core/src/test/org/apache/lucene/TestSearch.java b/lucene/core/src/test/org/apache/lucene/TestSearch.java index 345d7024647..a5fae059f95 100644 --- a/lucene/core/src/test/org/apache/lucene/TestSearch.java +++ b/lucene/core/src/test/org/apache/lucene/TestSearch.java @@ -1,5 +1,3 @@ -package org.apache.lucene; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene; + import java.io.PrintWriter; import java.io.StringWriter; diff --git a/lucene/core/src/test/org/apache/lucene/TestSearchForDuplicates.java b/lucene/core/src/test/org/apache/lucene/TestSearchForDuplicates.java index ac45b882a58..c55c7aaf090 100644 --- a/lucene/core/src/test/org/apache/lucene/TestSearchForDuplicates.java +++ b/lucene/core/src/test/org/apache/lucene/TestSearchForDuplicates.java @@ -1,5 +1,3 @@ -package org.apache.lucene; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene; + import java.io.IOException; import java.io.PrintWriter; diff --git a/lucene/core/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java b/lucene/core/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java index 66ee0ce7237..db3f8e0682c 100644 --- a/lucene/core/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java +++ b/lucene/core/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/analysis/TestCharFilter.java b/lucene/core/src/test/org/apache/lucene/analysis/TestCharFilter.java index 9817337e275..0aa19a7cadf 100644 --- a/lucene/core/src/test/org/apache/lucene/analysis/TestCharFilter.java +++ b/lucene/core/src/test/org/apache/lucene/analysis/TestCharFilter.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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/core/src/test/org/apache/lucene/analysis/TestNumericTokenStream.java b/lucene/core/src/test/org/apache/lucene/analysis/TestNumericTokenStream.java index 0d5d8a16f26..eb77bf4ae02 100644 --- a/lucene/core/src/test/org/apache/lucene/analysis/TestNumericTokenStream.java +++ b/lucene/core/src/test/org/apache/lucene/analysis/TestNumericTokenStream.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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis; + import org.apache.lucene.util.LegacyNumericUtils; import org.apache.lucene.analysis.LegacyNumericTokenStream.LegacyNumericTermAttributeImpl; diff --git a/lucene/core/src/test/org/apache/lucene/analysis/TestReusableStringReader.java b/lucene/core/src/test/org/apache/lucene/analysis/TestReusableStringReader.java index 45f8c424958..7f54e56093c 100644 --- a/lucene/core/src/test/org/apache/lucene/analysis/TestReusableStringReader.java +++ b/lucene/core/src/test/org/apache/lucene/analysis/TestReusableStringReader.java @@ -1,9 +1,3 @@ -package org.apache.lucene.analysis; - -import java.nio.CharBuffer; - -import org.apache.lucene.util.LuceneTestCase; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -20,6 +14,12 @@ import org.apache.lucene.util.LuceneTestCase; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis; + +import java.nio.CharBuffer; + +import org.apache.lucene.util.LuceneTestCase; + public class TestReusableStringReader extends LuceneTestCase { public void test() throws Exception { diff --git a/lucene/core/src/test/org/apache/lucene/analysis/TestToken.java b/lucene/core/src/test/org/apache/lucene/analysis/TestToken.java index e52587db9cc..fcf7779677f 100644 --- a/lucene/core/src/test/org/apache/lucene/analysis/TestToken.java +++ b/lucene/core/src/test/org/apache/lucene/analysis/TestToken.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 @@ -16,6 +14,8 @@ package org.apache.lucene.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis; + import org.apache.lucene.analysis.tokenattributes.*; import org.apache.lucene.util.AttributeReflector; diff --git a/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestBytesRefAttImpl.java b/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestBytesRefAttImpl.java index 9bf21de1a84..49e1c221b6b 100644 --- a/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestBytesRefAttImpl.java +++ b/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestBytesRefAttImpl.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.tokenattributes; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.tokenattributes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.tokenattributes; + import org.apache.lucene.util.AttributeImpl; import org.apache.lucene.util.BytesRef; diff --git a/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestCharTermAttributeImpl.java b/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestCharTermAttributeImpl.java index 2aae192741b..e02dd022efa 100644 --- a/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestCharTermAttributeImpl.java +++ b/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestCharTermAttributeImpl.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.tokenattributes; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.tokenattributes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.tokenattributes; + import org.apache.lucene.util.AttributeImpl; import org.apache.lucene.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestPackedTokenAttributeImpl.java b/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestPackedTokenAttributeImpl.java index 0717fe6c865..cf4409e3403 100644 --- a/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestPackedTokenAttributeImpl.java +++ b/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestPackedTokenAttributeImpl.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.tokenattributes; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.tokenattributes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.tokenattributes; + import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; diff --git a/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestSimpleAttributeImpl.java b/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestSimpleAttributeImpl.java index 7d547ea35f0..0f752dada38 100644 --- a/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestSimpleAttributeImpl.java +++ b/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestSimpleAttributeImpl.java @@ -1,5 +1,3 @@ -package org.apache.lucene.analysis.tokenattributes; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.analysis.tokenattributes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis.tokenattributes; + import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/codecs/TestCodecLoadingDeadlock.java b/lucene/core/src/test/org/apache/lucene/codecs/TestCodecLoadingDeadlock.java index 03251db24d4..65f30163da8 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/TestCodecLoadingDeadlock.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/TestCodecLoadingDeadlock.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs; + import java.nio.file.Paths; import java.util.ArrayList; diff --git a/lucene/core/src/test/org/apache/lucene/codecs/compressing/AbstractTestCompressionMode.java b/lucene/core/src/test/org/apache/lucene/codecs/compressing/AbstractTestCompressionMode.java index 305bf38741f..c8d244b7ddb 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/compressing/AbstractTestCompressionMode.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/compressing/AbstractTestCompressionMode.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.compressing; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.compressing; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.compressing; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/test/org/apache/lucene/codecs/compressing/AbstractTestLZ4CompressionMode.java b/lucene/core/src/test/org/apache/lucene/codecs/compressing/AbstractTestLZ4CompressionMode.java index 1cfdb446227..5a2801e606c 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/compressing/AbstractTestLZ4CompressionMode.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/compressing/AbstractTestLZ4CompressionMode.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.compressing; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.compressing; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.compressing; + import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestFastCompressionMode.java b/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestFastCompressionMode.java index 4fd3471f861..e33996ae414 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestFastCompressionMode.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestFastCompressionMode.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.compressing; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.compressing; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.compressing; + public class TestFastCompressionMode extends AbstractTestLZ4CompressionMode { diff --git a/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestFastDecompressionMode.java b/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestFastDecompressionMode.java index de14013d457..1ecfc8b602d 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestFastDecompressionMode.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestFastDecompressionMode.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.compressing; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.compressing; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.compressing; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestGrowableByteArrayDataOutput.java b/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestGrowableByteArrayDataOutput.java index a0a52c97a35..fb90d925eb9 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestGrowableByteArrayDataOutput.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestGrowableByteArrayDataOutput.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.compressing; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.compressing; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.compressing; + import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestHighCompressionMode.java b/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestHighCompressionMode.java index 065be638d75..61cf0c0e789 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestHighCompressionMode.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestHighCompressionMode.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.compressing; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.compressing; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.compressing; + public class TestHighCompressionMode extends AbstractTestCompressionMode { diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestBlockPostingsFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestBlockPostingsFormat.java index 16634002358..6acd05332ba 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestBlockPostingsFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestBlockPostingsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene50; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene50; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene50; + import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.Codec; diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestBlockPostingsFormat2.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestBlockPostingsFormat2.java index 47a33442298..b59c587da79 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestBlockPostingsFormat2.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestBlockPostingsFormat2.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene50; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene50; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene50; + import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestBlockPostingsFormat3.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestBlockPostingsFormat3.java index 82fa4651c06..1b3b9affdf3 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestBlockPostingsFormat3.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestBlockPostingsFormat3.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene50; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene50; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene50; + import java.util.ArrayList; import java.util.Collections; diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestForUtil.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestForUtil.java index 716b8b8e683..5d1e7267184 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestForUtil.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestForUtil.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene50; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene50; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene50; + import static org.apache.lucene.codecs.lucene50.Lucene50PostingsFormat.BLOCK_SIZE; import static org.apache.lucene.codecs.lucene50.ForUtil.MAX_DATA_SIZE; diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50CompoundFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50CompoundFormat.java index 27d091aca48..bfda748c451 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50CompoundFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50CompoundFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene50; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene50; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene50; + import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BaseCompoundFormatTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50FieldInfoFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50FieldInfoFormat.java index 183486feaa4..222ba5ec2ad 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50FieldInfoFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50FieldInfoFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene50; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene50; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene50; + import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BaseFieldInfoFormatTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50SegmentInfoFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50SegmentInfoFormat.java index cfe98ac5e5e..81143300ee5 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50SegmentInfoFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50SegmentInfoFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene50; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene50; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene50; + import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BaseSegmentInfoFormatTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50StoredFieldsFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50StoredFieldsFormat.java index f8681b256bb..4c7bed478c0 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50StoredFieldsFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50StoredFieldsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene50; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene50; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene50; + import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BaseStoredFieldsFormatTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50StoredFieldsFormatHighCompression.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50StoredFieldsFormatHighCompression.java index 2d58170434a..1fe84aa9893 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50StoredFieldsFormatHighCompression.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50StoredFieldsFormatHighCompression.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene50; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene50; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene50; + import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.lucene50.Lucene50StoredFieldsFormat.Mode; diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50TermVectorsFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50TermVectorsFormat.java index 0fe49410d21..e82463d4153 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50TermVectorsFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50TermVectorsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene50; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene50; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene50; + import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BaseTermVectorsFormatTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene53/TestLucene53NormsFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene53/TestLucene53NormsFormat.java index 361dd0f12b7..c915de0bfce 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene53/TestLucene53NormsFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene53/TestLucene53NormsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene53; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene53; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene53; + import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.lucene60.Lucene60Codec; diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene54/TestLucene54DocValuesFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene54/TestLucene54DocValuesFormat.java index 352ee8046e9..cede1d7efc3 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene54/TestLucene54DocValuesFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene54/TestLucene54DocValuesFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene54; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene54; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene54; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/test/org/apache/lucene/codecs/lucene60/TestLucene60PointFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/lucene60/TestLucene60PointFormat.java index 322640bfda6..272fc6b3b3c 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/lucene60/TestLucene60PointFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/lucene60/TestLucene60PointFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.lucene60; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.lucene60; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.lucene60; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java index 1a9161fe1f8..2eb0d1a94e4 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.perfield; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.perfield; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.perfield; + import java.io.IOException; import java.util.Collections; diff --git a/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat.java index cd2ec13ab6c..a1433e3061c 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.perfield; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.perfield; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.perfield; + import java.util.Collections; import java.util.Random; diff --git a/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat2.java b/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat2.java index 5be8c78f3b5..67d61df375e 100644 --- a/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat2.java +++ b/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat2.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.perfield; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.codecs.perfield; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.perfield; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/document/TestBinaryDocument.java b/lucene/core/src/test/org/apache/lucene/document/TestBinaryDocument.java index 969a9c89adf..7d04f3b2643 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestBinaryDocument.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestBinaryDocument.java @@ -1,5 +1,3 @@ -package org.apache.lucene.document; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.document; + import java.nio.charset.StandardCharsets; diff --git a/lucene/core/src/test/org/apache/lucene/document/TestDateTools.java b/lucene/core/src/test/org/apache/lucene/document/TestDateTools.java index 183e3e27bb3..ed99ff06ee5 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestDateTools.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestDateTools.java @@ -1,11 +1,3 @@ -package org.apache.lucene.document; - -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.*; - -import org.apache.lucene.util.LuceneTestCase; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -22,6 +14,14 @@ import org.apache.lucene.util.LuceneTestCase; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.document; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; + +import org.apache.lucene.util.LuceneTestCase; + public class TestDateTools extends LuceneTestCase { public void testStringToDate() throws ParseException { diff --git a/lucene/core/src/test/org/apache/lucene/document/TestDocument.java b/lucene/core/src/test/org/apache/lucene/document/TestDocument.java index af370594358..41e1f6225be 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestDocument.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestDocument.java @@ -1,5 +1,3 @@ -package org.apache.lucene.document; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.document; + import java.io.StringReader; import java.nio.charset.StandardCharsets; diff --git a/lucene/core/src/test/org/apache/lucene/document/TestField.java b/lucene/core/src/test/org/apache/lucene/document/TestField.java index 6077c070e99..85336bc966e 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestField.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestField.java @@ -1,5 +1,3 @@ -package org.apache.lucene.document; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.document; + import java.io.StringReader; import java.nio.charset.StandardCharsets; diff --git a/lucene/core/src/test/org/apache/lucene/document/TestFieldType.java b/lucene/core/src/test/org/apache/lucene/document/TestFieldType.java index 00b0966b3d1..dcde590e407 100644 --- a/lucene/core/src/test/org/apache/lucene/document/TestFieldType.java +++ b/lucene/core/src/test/org/apache/lucene/document/TestFieldType.java @@ -1,5 +1,3 @@ -package org.apache.lucene.document; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.document; + import java.lang.reflect.Method; import java.lang.reflect.Modifier; diff --git a/lucene/core/src/test/org/apache/lucene/index/Test2BBinaryDocValues.java b/lucene/core/src/test/org/apache/lucene/index/Test2BBinaryDocValues.java index 1d1289027f8..9f273dfb74a 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test2BBinaryDocValues.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test2BBinaryDocValues.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.BinaryDocValuesField; diff --git a/lucene/core/src/test/org/apache/lucene/index/Test2BNumericDocValues.java b/lucene/core/src/test/org/apache/lucene/index/Test2BNumericDocValues.java index b36e27a8fa5..24600734790 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test2BNumericDocValues.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test2BNumericDocValues.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; diff --git a/lucene/core/src/test/org/apache/lucene/index/Test2BPositions.java b/lucene/core/src/test/org/apache/lucene/index/Test2BPositions.java index 526608f6fde..d65c95c4e49 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test2BPositions.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test2BPositions.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.TokenStream; diff --git a/lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java b/lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java index e4fb303e529..15a931fceec 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test2BPostings.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.TokenStream; diff --git a/lucene/core/src/test/org/apache/lucene/index/Test2BPostingsBytes.java b/lucene/core/src/test/org/apache/lucene/index/Test2BPostingsBytes.java index f4308d1c598..ae935d68a2e 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test2BPostingsBytes.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test2BPostingsBytes.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.util.Arrays; import java.util.regex.Matcher; diff --git a/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValuesFixedSorted.java b/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValuesFixedSorted.java index 5d803622a20..56bf4b5a3b3 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValuesFixedSorted.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValuesFixedSorted.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; diff --git a/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValuesOrds.java b/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValuesOrds.java index d2444e2a694..70ed6bf37bd 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValuesOrds.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValuesOrds.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; diff --git a/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java b/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java index f70d102215d..22b3605965b 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/test/org/apache/lucene/index/Test4GBStoredFields.java b/lucene/core/src/test/org/apache/lucene/index/Test4GBStoredFields.java index 1d3ee568b32..0129bf9ad5f 100644 --- a/lucene/core/src/test/org/apache/lucene/index/Test4GBStoredFields.java +++ b/lucene/core/src/test/org/apache/lucene/index/Test4GBStoredFields.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java b/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java index 778a7eb7353..2e9111214d0 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestAddIndexes.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.FileNotFoundException; import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesCheckIndexHeader.java b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesCheckIndexHeader.java index 30315538ee8..109d1b5addc 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesCheckIndexHeader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesCheckIndexHeader.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.EOFException; import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesDetectTruncation.java b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesDetectTruncation.java index 347955d639c..a34087a4805 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesDetectTruncation.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesDetectTruncation.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.EOFException; import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveChecksumFooter.java b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveChecksumFooter.java index 710d20f86f5..9067e71bbd4 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveChecksumFooter.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveChecksumFooter.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveCodecHeader.java b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveCodecHeader.java index d7260195283..a0df61d97d5 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveCodecHeader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveCodecHeader.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.HashMap; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestAtomicUpdate.java b/lucene/core/src/test/org/apache/lucene/index/TestAtomicUpdate.java index e801bccbc8a..3fc889bfb16 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestAtomicUpdate.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestAtomicUpdate.java @@ -1,11 +1,10 @@ -package org.apache.lucene.index; - /* - * Copyright 2004 The Apache Software Foundation - * - * Licensed 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 + * 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 * @@ -15,8 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; -import java.io.File; import java.nio.file.Path; import org.apache.lucene.analysis.MockAnalyzer; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestBagOfPositions.java b/lucene/core/src/test/org/apache/lucene/index/TestBagOfPositions.java index 438b4ac1490..164840885a5 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestBagOfPositions.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestBagOfPositions.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.util.ArrayList; import java.util.Collections; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestBagOfPostings.java b/lucene/core/src/test/org/apache/lucene/index/TestBagOfPostings.java index e6ce3063a00..8cd25519567 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestBagOfPostings.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestBagOfPostings.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.util.ArrayList; import java.util.Collections; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestBinaryDocValuesUpdates.java b/lucene/core/src/test/org/apache/lucene/index/TestBinaryDocValuesUpdates.java index 9d72bd0171c..de44b06d4e3 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestBinaryDocValuesUpdates.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestBinaryDocValuesUpdates.java @@ -1,3 +1,19 @@ +/* + * 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.index; import java.io.IOException; @@ -32,22 +48,6 @@ import org.junit.Test; import com.carrotsearch.randomizedtesting.generators.RandomPicks; -/* - * 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 TestBinaryDocValuesUpdates extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestBinaryTerms.java b/lucene/core/src/test/org/apache/lucene/index/TestBinaryTerms.java index 1257edae1ea..8da8c23574b 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestBinaryTerms.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestBinaryTerms.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestByteSlices.java b/lucene/core/src/test/org/apache/lucene/index/TestByteSlices.java index c87c76ece08..48f89166ec0 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestByteSlices.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestByteSlices.java @@ -1,9 +1,10 @@ -package org.apache.lucene.index; - /* - * Licensed 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 + * 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 * @@ -13,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import org.apache.lucene.util.ByteBlockPool; import org.apache.lucene.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestCheckIndex.java b/lucene/core/src/test/org/apache/lucene/index/TestCheckIndex.java index e0e199a7989..7b71d3c5cfc 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestCheckIndex.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestCheckIndex.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestCodecHoldsOpenFiles.java b/lucene/core/src/test/org/apache/lucene/index/TestCodecHoldsOpenFiles.java index 8077545256b..0c0605fa4ee 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestCodecHoldsOpenFiles.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestCodecHoldsOpenFiles.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestCodecUtil.java b/lucene/core/src/test/org/apache/lucene/index/TestCodecUtil.java index 6f248c80f0b..79fbdeb3fff 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestCodecUtil.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestCodecUtil.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.concurrent.atomic.AtomicLong; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java b/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java index 52d47eca419..73b4622b82c 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestCodecs.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java b/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java index 083e4269ac0..83e6f0ab1b8 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.concurrent.CountDownLatch; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.java b/lucene/core/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.java index dd4e3bb980f..b114589afe4 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestConsistentFieldNumbers.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestCrash.java b/lucene/core/src/test/org/apache/lucene/index/TestCrash.java index 951aa7d1fd7..22ab2e21056 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestCrash.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestCrash.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.Random; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java b/lucene/core/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java index 407c077eebc..aebfb50e175 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestCrashCausesCorruptIndex.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.nio.file.Path; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestCustomNorms.java b/lucene/core/src/test/org/apache/lucene/index/TestCustomNorms.java index d81ffc8f6fe..1d0ba540045 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestCustomNorms.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestCustomNorms.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import org.apache.lucene.analysis.MockAnalyzer; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDeletionPolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestDeletionPolicy.java index b56b1a05805..846192342b3 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDeletionPolicy.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDeletionPolicy.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDemoParallelLeafReader.java b/lucene/core/src/test/org/apache/lucene/index/TestDemoParallelLeafReader.java index ae41299125c..319ac1342fc 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDemoParallelLeafReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDemoParallelLeafReader.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.Closeable; import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java b/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java index 00b424fdc5f..6ffa15e2216 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.FileNotFoundException; import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReaderReopen.java b/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReaderReopen.java index 2c3b134aefa..2919423ae3d 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReaderReopen.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReaderReopen.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDoc.java b/lucene/core/src/test/org/apache/lucene/index/TestDoc.java index 39fbec86ac3..086633ee9e5 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDoc.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDoc.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.io.InputStreamReader; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDocCount.java b/lucene/core/src/test/org/apache/lucene/index/TestDocCount.java index 18089bf4292..0f221e32d27 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDocCount.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDocCount.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDocInverterPerFieldErrorInfo.java b/lucene/core/src/test/org/apache/lucene/index/TestDocInverterPerFieldErrorInfo.java index c426bb53524..1e934789a12 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDocInverterPerFieldErrorInfo.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDocInverterPerFieldErrorInfo.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.MockTokenizer; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDocValues.java b/lucene/core/src/test/org/apache/lucene/index/TestDocValues.java index eefd35699c1..b8573cb61d6 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDocValues.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDocValues.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.document.BinaryDocValuesField; import org.apache.lucene.document.Document; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java b/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java index 10edf17ea86..a20edae872d 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.concurrent.CountDownLatch; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java b/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java index d9f5dd7b737..dc49db154e3 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java b/lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java index cd1b60a5585..489a185b326 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDocumentsWriterDeleteQueue.java b/lucene/core/src/test/org/apache/lucene/index/TestDocumentsWriterDeleteQueue.java index cc0cfb3d592..51e17cf8ccb 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDocumentsWriterDeleteQueue.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDocumentsWriterDeleteQueue.java @@ -1,21 +1,20 @@ -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 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 - * + * 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. + * 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.index; import java.util.HashSet; import java.util.Set; @@ -30,8 +29,6 @@ import org.apache.lucene.util.BytesRefBuilder; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.ThreadInterruptedException; - - /** * Unit test for {@link DocumentsWriterDeleteQueue} */ diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDocumentsWriterStallControl.java b/lucene/core/src/test/org/apache/lucene/index/TestDocumentsWriterStallControl.java index d7a85fde505..2575e616184 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDocumentsWriterStallControl.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDocumentsWriterStallControl.java @@ -1,21 +1,20 @@ -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 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 - * + * 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. + * 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.index; import java.util.ArrayList; import java.util.Collections; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java b/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java index 79ac35c81e0..62fe28aedb2 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.Codec; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecsAtNight.java b/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecsAtNight.java index 08479b4e526..41143b286e7 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecsAtNight.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecsAtNight.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.util.LuceneTestCase.Nightly; import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestExceedMaxTermLength.java b/lucene/core/src/test/org/apache/lucene/index/TestExceedMaxTermLength.java index 256b66510ff..fb8493af3f6 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestExceedMaxTermLength.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestExceedMaxTermLength.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestExitableDirectoryReader.java b/lucene/core/src/test/org/apache/lucene/index/TestExitableDirectoryReader.java index e2a18200cce..1aa6eea1a77 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestExitableDirectoryReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestExitableDirectoryReader.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestFieldReuse.java b/lucene/core/src/test/org/apache/lucene/index/TestFieldReuse.java index 2fdabad6923..b36cfefa9ff 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestFieldReuse.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestFieldReuse.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.io.Reader; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestFieldsReader.java b/lucene/core/src/test/org/apache/lucene/index/TestFieldsReader.java index d9a1d2e6f66..9a52287b9f4 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestFieldsReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestFieldsReader.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.nio.file.Path; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestFilterDirectoryReader.java b/lucene/core/src/test/org/apache/lucene/index/TestFilterDirectoryReader.java index d31e65fbb95..4ce86e2c6a1 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestFilterDirectoryReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestFilterDirectoryReader.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestFilterLeafReader.java b/lucene/core/src/test/org/apache/lucene/index/TestFilterLeafReader.java index c2d74a178a6..82fb3bce2f6 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestFilterLeafReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestFilterLeafReader.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestFlex.java b/lucene/core/src/test/org/apache/lucene/index/TestFlex.java index ce41cdd53f6..3d716e13fef 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestFlex.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestFlex.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.store.*; import org.apache.lucene.analysis.*; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java index 4deb2f69fc2..562913e079a 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestForTooMuchCloning.java b/lucene/core/src/test/org/apache/lucene/index/TestForTooMuchCloning.java index 46c3e2ce0fd..89a77cd29eb 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestForTooMuchCloning.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestForTooMuchCloning.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestForceMergeForever.java b/lucene/core/src/test/org/apache/lucene/index/TestForceMergeForever.java index 54f100848b8..3edeef15f61 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestForceMergeForever.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestForceMergeForever.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexCommit.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexCommit.java index fda37cf0abc..86f9e4c4243 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexCommit.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexCommit.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.util.Collection; import java.util.Map; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java index 5fa777b3740..2ca0b270815 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.*; import java.util.*; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexInput.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexInput.java index 4acc566b69d..73ba64a6f35 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexInput.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexInput.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.TestUtil; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexReaderClose.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexReaderClose.java index cc66b13820a..b89679cdc7c 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexReaderClose.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexReaderClose.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java index baa24849e7f..fff7ac87f86 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.ByteArrayOutputStream; import java.io.FileNotFoundException; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java index 380471788d4..e1cdd9b2956 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterCommit.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterConfig.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterConfig.java index 89342e5ee94..3d85f0cf8fa 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterConfig.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterConfig.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java index 9213c25f696..56b13dfc868 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDeleteByQuery.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDeleteByQuery.java index c36cc1cc37c..2470e2966ee 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDeleteByQuery.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDeleteByQuery.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java index 055fc5aa62c..8b24f120343 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.FileNotFoundException; import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions2.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions2.java index 4c4c496fdec..91edf474cf3 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions2.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions2.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.ByteArrayOutputStream; import java.io.PrintStream; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java index 19030cc00a1..9a0fecaa60c 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterForceMerge.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterFromReader.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterFromReader.java index baa74e14557..d25711d3824 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterFromReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterFromReader.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterLockRelease.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterLockRelease.java index a7231c216ee..9587380e8b7 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterLockRelease.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterLockRelease.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.FileNotFoundException; import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMaxDocs.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMaxDocs.java index 2768f4e66d8..665faaeed31 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMaxDocs.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMaxDocs.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java index c83055c9a9d..d03de7e6994 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java index 41d3cb3a9e1..87540b76701 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java @@ -1,10 +1,10 @@ -package org.apache.lucene.index; /* - * Copyright 2006 The Apache Software Foundation - * - * Licensed 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 + * 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 * @@ -14,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import java.io.IOException; import java.util.Random; @@ -30,9 +31,7 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.MockDirectoryWrapper; import org.apache.lucene.util.LuceneTestCase; - -public class TestIndexWriterMerging extends LuceneTestCase -{ +public class TestIndexWriterMerging extends LuceneTestCase { /** * Tests that index merging (specifically addIndexes(Directory...)) doesn't diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterNRTIsCurrent.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterNRTIsCurrent.java index afcb07c697c..ee7a2367e42 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterNRTIsCurrent.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterNRTIsCurrent.java @@ -1,21 +1,21 @@ -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 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 - * + * 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. + * 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.index; + import java.io.IOException; import java.util.Random; import java.util.concurrent.CountDownLatch; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java index f75230c8f2d..105123446c6 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnJRECrash.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnJRECrash.java index 777ef46d4a1..740350500f1 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnJRECrash.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnJRECrash.java @@ -1,22 +1,20 @@ -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 - * 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 + * 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. + * 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.index; import java.io.IOException; import java.io.InputStream; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnVMError.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnVMError.java index 91da346f74f..d17c4d02ada 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnVMError.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnVMError.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOutOfFileDescriptors.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOutOfFileDescriptors.java index 30aac07a31e..98744511dc4 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOutOfFileDescriptors.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOutOfFileDescriptors.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.HashSet; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java index c566b1c220a..173128eae6f 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java @@ -1,11 +1,10 @@ -package org.apache.lucene.index; - /* - * Copyright 2004 The Apache Software Foundation - * - * Licensed 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 + * 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 * @@ -15,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterThreadsToSegments.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterThreadsToSegments.java index 99f66639d8b..4e884dfb888 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterThreadsToSegments.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterThreadsToSegments.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.Closeable; import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java index 96cdfe91f88..f45cf210dba 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterUnicode.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.nio.CharBuffer; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java index e2348df201d..72029cb5efa 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.concurrent.CountDownLatch; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java index de2f60c0cd5..67edab90437 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.Reader; import java.io.StringReader; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestInfoStream.java b/lucene/core/src/test/org/apache/lucene/index/TestInfoStream.java index cd3cbc07e75..4ef22085689 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestInfoStream.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestInfoStream.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIntBlockPool.java b/lucene/core/src/test/org/apache/lucene/index/TestIntBlockPool.java index 199c3a7f423..1ad7c1d9e08 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIntBlockPool.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIntBlockPool.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.util.ArrayList; import java.util.List; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIsCurrent.java b/lucene/core/src/test/org/apache/lucene/index/TestIsCurrent.java index d9421967368..7d6e31db54d 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestIsCurrent.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestIsCurrent.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestLazyProxSkipping.java b/lucene/core/src/test/org/apache/lucene/index/TestLazyProxSkipping.java index 5f15ab172cd..a928fd2b102 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestLazyProxSkipping.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestLazyProxSkipping.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestLogMergePolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestLogMergePolicy.java index 8dffdf88851..9dde87a027c 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestLogMergePolicy.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestLogMergePolicy.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + public class TestLogMergePolicy extends BaseMergePolicyTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestLongPostings.java b/lucene/core/src/test/org/apache/lucene/index/TestLongPostings.java index 1fe64067c0b..bafea384c2d 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestLongPostings.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestLongPostings.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestManyFields.java b/lucene/core/src/test/org/apache/lucene/index/TestManyFields.java index 07b731b8d5f..9b2f732649c 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestManyFields.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestManyFields.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestMaxPosition.java b/lucene/core/src/test/org/apache/lucene/index/TestMaxPosition.java index 59c540cb075..f8c7ceb759c 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestMaxPosition.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestMaxPosition.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.analysis.CannedTokenStream; import org.apache.lucene.analysis.Token; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java b/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java index 4509f0b2283..69a7f7f9ade 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestMaxTermFrequency.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.util.ArrayList; import java.util.Arrays; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestMergeRateLimiter.java b/lucene/core/src/test/org/apache/lucene/index/TestMergeRateLimiter.java index fa2f4b0b0d0..670bcdbd257 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestMergeRateLimiter.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestMergeRateLimiter.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.util.Collections; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestMixedCodecs.java b/lucene/core/src/test/org/apache/lucene/index/TestMixedCodecs.java index 6fc5c84626d..1d687bc93f1 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestMixedCodecs.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestMixedCodecs.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.util.HashSet; import java.util.Set; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestMixedDocValuesUpdates.java b/lucene/core/src/test/org/apache/lucene/index/TestMixedDocValuesUpdates.java index 6d9e3ee1f8d..72a67ec42ca 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestMixedDocValuesUpdates.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestMixedDocValuesUpdates.java @@ -1,3 +1,19 @@ +/* + * 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.index; import java.io.IOException; @@ -23,22 +39,6 @@ import org.apache.lucene.util.TestUtil; import com.carrotsearch.randomizedtesting.generators.RandomPicks; -/* - * 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 TestMixedDocValuesUpdates extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestMultiDocValues.java b/lucene/core/src/test/org/apache/lucene/index/TestMultiDocValues.java index e3352336ffc..121e85c3475 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestMultiDocValues.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestMultiDocValues.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.util.ArrayList; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java b/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java index 7de3132034c..f0954f3968d 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.util.ArrayList; import java.util.Collections; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java b/lucene/core/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java index 11ab22b9447..a82444bf9ea 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestMultiLevelSkipList.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.concurrent.atomic.AtomicInteger; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestMultiTermsEnum.java b/lucene/core/src/test/org/apache/lucene/index/TestMultiTermsEnum.java index f50f1920275..ed59d5ba08c 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestMultiTermsEnum.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestMultiTermsEnum.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.Collection; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderCleanup.java b/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderCleanup.java index 6d9bb695e9b..f1d77fe1aa1 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderCleanup.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderCleanup.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java b/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java index 41da4de99de..871715f2020 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestNRTReaderWithThreads.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.util.Random; import java.util.concurrent.atomic.AtomicInteger; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNRTThreads.java b/lucene/core/src/test/org/apache/lucene/index/TestNRTThreads.java index a4294132ff2..1b55653db0e 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestNRTThreads.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestNRTThreads.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.util.Set; import java.util.concurrent.ExecutorService; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNeverDelete.java b/lucene/core/src/test/org/apache/lucene/index/TestNeverDelete.java index 0a0438a53d8..8f11557a526 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestNeverDelete.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestNeverDelete.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.nio.file.Path; import java.util.HashSet; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNewestSegment.java b/lucene/core/src/test/org/apache/lucene/index/TestNewestSegment.java index 5c4086178ea..1209ad0193a 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestNewestSegment.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestNewestSegment.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.store.Directory; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNoDeletionPolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestNoDeletionPolicy.java index 7377b46fe25..329d09fe721 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestNoDeletionPolicy.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestNoDeletionPolicy.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.lang.reflect.Constructor; import java.lang.reflect.Method; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNoMergePolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestNoMergePolicy.java index bdd83c6b19a..21f54d7338a 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestNoMergePolicy.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestNoMergePolicy.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.lang.reflect.Constructor; import java.lang.reflect.Method; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNoMergeScheduler.java b/lucene/core/src/test/org/apache/lucene/index/TestNoMergeScheduler.java index 03e2fe7498c..135d33e3cbe 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestNoMergeScheduler.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestNoMergeScheduler.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import com.carrotsearch.randomizedtesting.generators.RandomPicks; import org.apache.lucene.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNorms.java b/lucene/core/src/test/org/apache/lucene/index/TestNorms.java index 804fa5922c5..78fc8724249 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestNorms.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestNorms.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.Random; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java b/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java index 1fb2206b98e..9f9728347b2 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java @@ -1,3 +1,19 @@ +/* + * 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.index; import java.io.IOException; @@ -38,22 +54,6 @@ import org.junit.Test; import com.carrotsearch.randomizedtesting.generators.RandomPicks; -/* - * 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. - */ @SuppressWarnings("resource") public class TestNumericDocValuesUpdates extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/index/TestOmitNorms.java b/lucene/core/src/test/org/apache/lucene/index/TestOmitNorms.java index 317310e55e2..83dfd193b91 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestOmitNorms.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestOmitNorms.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestOmitPositions.java b/lucene/core/src/test/org/apache/lucene/index/TestOmitPositions.java index 551a073e320..41dd5ce31f0 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestOmitPositions.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestOmitPositions.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.MockAnalyzer; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java b/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java index 187216bfae4..8f136098c33 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestOmitTf.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestOrdinalMap.java b/lucene/core/src/test/org/apache/lucene/index/TestOrdinalMap.java index cc4b383d449..e0fab18573b 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestOrdinalMap.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestOrdinalMap.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.lang.reflect.Field; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestParallelCompositeReader.java b/lucene/core/src/test/org/apache/lucene/index/TestParallelCompositeReader.java index 96aac048563..e7d735c25d6 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestParallelCompositeReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestParallelCompositeReader.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.Random; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestParallelLeafReader.java b/lucene/core/src/test/org/apache/lucene/index/TestParallelLeafReader.java index 4c6a89ce056..ff6fab6d1ac 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestParallelLeafReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestParallelLeafReader.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.Random; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java b/lucene/core/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java index ffc7b609fb2..373a125eeb6 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.java b/lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.java index ae4e3c9af72..c51fd2d7280 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.Iterator; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestPayloads.java b/lucene/core/src/test/org/apache/lucene/index/TestPayloads.java index 26f09bae4d3..3fa213109a6 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestPayloads.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestPayloads.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.io.StringReader; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestPayloadsOnVectors.java b/lucene/core/src/test/org/apache/lucene/index/TestPayloadsOnVectors.java index 54506561501..3b0117d1337 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestPayloadsOnVectors.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestPayloadsOnVectors.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.StringReader; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java b/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java index 8b843198f9c..99a02024c8e 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestPersistentSnapshotDeletionPolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestPersistentSnapshotDeletionPolicy.java index c94b66a190c..52f7b83ad1f 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestPersistentSnapshotDeletionPolicy.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestPersistentSnapshotDeletionPolicy.java @@ -1,21 +1,20 @@ -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 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 - * + * 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. + * 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.index; import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestPointValues.java b/lucene/core/src/test/org/apache/lucene/index/TestPointValues.java index ff5fdf883e0..0eb5e8feb94 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestPointValues.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestPointValues.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.Codec; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java b/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java index d81225cd90c..bf01c8ad72d 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestPrefixCodedTerms.java b/lucene/core/src/test/org/apache/lucene/index/TestPrefixCodedTerms.java index b4b0b492649..89d4ad17d45 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestPrefixCodedTerms.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestPrefixCodedTerms.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.util.Arrays; import java.util.Iterator; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestReadOnlyIndex.java b/lucene/core/src/test/org/apache/lucene/index/TestReadOnlyIndex.java index dabfae1a850..11e583e0391 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestReadOnlyIndex.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestReadOnlyIndex.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.FilePermission; import java.nio.file.Files; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java b/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java index 55258c67f7c..6a1ab3a4018 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestReaderClosed.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.util.concurrent.ExecutionException; import java.util.concurrent.RejectedExecutionException; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestReaderWrapperDVTypeCheck.java b/lucene/core/src/test/org/apache/lucene/index/TestReaderWrapperDVTypeCheck.java index 70cc5b871a9..308c48ee77d 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestReaderWrapperDVTypeCheck.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestReaderWrapperDVTypeCheck.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.index; import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestRollback.java b/lucene/core/src/test/org/apache/lucene/index/TestRollback.java index 8232ee5f166..4286bb73388 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestRollback.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestRollback.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java b/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java index f36702426e5..5988ec3ee91 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.util.Random; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSameTokenSamePosition.java b/lucene/core/src/test/org/apache/lucene/index/TestSameTokenSamePosition.java index 52b8ce891b1..4bb23181286 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestSameTokenSamePosition.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestSameTokenSamePosition.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSegmentInfos.java b/lucene/core/src/test/org/apache/lucene/index/TestSegmentInfos.java index ac3561dbde0..733f75eefdd 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestSegmentInfos.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestSegmentInfos.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.codecs.Codec; import org.apache.lucene.store.BaseDirectoryWrapper; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java b/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java index 1e96db6d996..e1075abe735 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java b/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java index e330a74b93f..e43bc0e7c42 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.Collection; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java b/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java index b914c57f63d..7acf3e44973 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermEnum.java b/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermEnum.java index 512f94923c7..fc708c2e786 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermEnum.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermEnum.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSizeBoundedForceMerge.java b/lucene/core/src/test/org/apache/lucene/index/TestSizeBoundedForceMerge.java index b31c77bedac..81148680da3 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestSizeBoundedForceMerge.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestSizeBoundedForceMerge.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java index 1780494b4be..215e84a2023 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java b/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java index 7a9ddd38e23..d423616c098 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.util.ArrayList; import java.util.HashSet; import java.util.List; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestStressDeletes.java b/lucene/core/src/test/org/apache/lucene/index/TestStressDeletes.java index 1df019c1121..a80852b81c6 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestStressDeletes.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestStressDeletes.java @@ -1,11 +1,10 @@ -package org.apache.lucene.index; - /* - * Copyright 2004 The Apache Software Foundation - * - * Licensed 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 + * 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 * @@ -15,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing.java b/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing.java index 87a0ea431c9..dcc5cd9c049 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing.java @@ -1,11 +1,10 @@ -package org.apache.lucene.index; - /* - * Copyright 2004 The Apache Software Foundation - * - * Licensed 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 + * 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 * @@ -15,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import org.apache.lucene.util.*; import org.apache.lucene.store.*; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java b/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java index 6326209ed13..646d677b068 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java @@ -1,9 +1,10 @@ -package org.apache.lucene.index; - /* - * Licensed 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 + * 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 * @@ -13,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java b/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java index b6cc489750a..8a082e4c7b1 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestStressNRT.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.util.ArrayList; import java.util.HashMap; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSumDocFreq.java b/lucene/core/src/test/org/apache/lucene/index/TestSumDocFreq.java index 971df82e08c..67063f661de 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestSumDocFreq.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestSumDocFreq.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestSwappedIndexFiles.java b/lucene/core/src/test/org/apache/lucene/index/TestSwappedIndexFiles.java index c412545d2bd..0c2477507eb 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestSwappedIndexFiles.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestSwappedIndexFiles.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.EOFException; import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTerm.java b/lucene/core/src/test/org/apache/lucene/index/TestTerm.java index 22c0e53404f..f7cad854a79 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTerm.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTerm.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTermVectors.java b/lucene/core/src/test/org/apache/lucene/index/TestTermVectors.java index d4bbf445d56..dd8616aed71 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTermVectors.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTermVectors.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.MockTokenizer; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java b/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java index 8495010fad4..fad075533d6 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java b/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java index 6dec07c6bf7..f1ce915dfa5 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsWriter.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java b/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java index 9190843209e..2060353dff8 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTermdocPerf.java @@ -1,11 +1,10 @@ -package org.apache.lucene.index; - /* - * Copyright 2006 The Apache Software Foundation - * - * Licensed 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 + * 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 * @@ -15,7 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.index; import java.io.IOException; import java.util.Random; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTerms.java b/lucene/core/src/test/org/apache/lucene/index/TestTerms.java index 23f83e0d5bd..6c41646249b 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTerms.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTerms.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.analysis.CannedBinaryTokenStream; import org.apache.lucene.document.Document; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java b/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java index 44eca85259e..3296330b489 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.*; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java b/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java index 9d0053f5abd..00181d54512 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTermsEnum2.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.util.ArrayList; import java.util.Collections; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestThreadedForceMerge.java b/lucene/core/src/test/org/apache/lucene/index/TestThreadedForceMerge.java index 6c8235d8755..dae20b5b857 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestThreadedForceMerge.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestThreadedForceMerge.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.Analyzer; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java index 945cf105d39..1c83e06d1ab 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTragicIndexWriterDeadlock.java b/lucene/core/src/test/org/apache/lucene/index/TestTragicIndexWriterDeadlock.java index d09dc785926..3cce69831b5 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTragicIndexWriterDeadlock.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTragicIndexWriterDeadlock.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java b/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java index afc3dfdac70..3abb3922685 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTransactionRollback.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTransactions.java b/lucene/core/src/test/org/apache/lucene/index/TestTransactions.java index d21d188d5f9..92a6b08228b 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTransactions.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTransactions.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTryDelete.java b/lucene/core/src/test/org/apache/lucene/index/TestTryDelete.java index b6df55f0081..f9f1f0d492b 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTryDelete.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTryDelete.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestTwoPhaseCommitTool.java b/lucene/core/src/test/org/apache/lucene/index/TestTwoPhaseCommitTool.java index 2c18ece8d7d..be6e4f81b92 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestTwoPhaseCommitTool.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestTwoPhaseCommitTool.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.Map; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java b/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java index 2cb9332c66e..575a9bb951f 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestUpgradeIndexMergePolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestUpgradeIndexMergePolicy.java index 857bccadf19..0ab13b42def 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestUpgradeIndexMergePolicy.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestUpgradeIndexMergePolicy.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 @@ -16,6 +14,8 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + public class TestUpgradeIndexMergePolicy extends BaseMergePolicyTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/BaseTestRangeFilter.java b/lucene/core/src/test/org/apache/lucene/search/BaseTestRangeFilter.java index 667975667e4..48ba704db58 100644 --- a/lucene/core/src/test/org/apache/lucene/search/BaseTestRangeFilter.java +++ b/lucene/core/src/test/org/apache/lucene/search/BaseTestRangeFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.Random; diff --git a/lucene/core/src/test/org/apache/lucene/search/JustCompileSearch.java b/lucene/core/src/test/org/apache/lucene/search/JustCompileSearch.java index 3970042a62e..ca586cfe49e 100644 --- a/lucene/core/src/test/org/apache/lucene/search/JustCompileSearch.java +++ b/lucene/core/src/test/org/apache/lucene/search/JustCompileSearch.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.Set; diff --git a/lucene/core/src/test/org/apache/lucene/search/MultiCollectorTest.java b/lucene/core/src/test/org/apache/lucene/search/MultiCollectorTest.java index 337490d9127..fe6374120de 100644 --- a/lucene/core/src/test/org/apache/lucene/search/MultiCollectorTest.java +++ b/lucene/core/src/test/org/apache/lucene/search/MultiCollectorTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestApproximationSearchEquivalence.java b/lucene/core/src/test/org/apache/lucene/search/TestApproximationSearchEquivalence.java index c4709db1f8d..a4926fc3cb7 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestApproximationSearchEquivalence.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestApproximationSearchEquivalence.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java index 83ce3f4e6b3..d4c865fac01 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java b/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java index 88f694de575..7b103645aac 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestAutomatonQueryUnicode.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBlendedTermQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestBlendedTermQuery.java index b057d88ba7a..c1010c3db89 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBlendedTermQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBlendedTermQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java b/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java index 5bb606c45f7..105cd6024cd 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBoolean2.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.util.Random; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBooleanCoord.java b/lucene/core/src/test/org/apache/lucene/search/TestBooleanCoord.java index e7c11334920..da55d9bc124 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBooleanCoord.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBooleanCoord.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java b/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java index b25faa1cda8..e10a0a11706 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBooleanMinShouldMatch.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java b/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java index d40dfe13ecf..d2d51dc6c4b 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBooleanOr.java @@ -1,4 +1,3 @@ -package org.apache.lucene.search; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java index 78faa36550c..5e16bcb2f66 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java b/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java index 7a7dc2f9c07..443246b2319 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBooleanQueryVisitSubscorers.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBooleanRewrites.java b/lucene/core/src/test/org/apache/lucene/search/TestBooleanRewrites.java index c0df2f6bbfc..fd54640ae62 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBooleanRewrites.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBooleanRewrites.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java b/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java index 35eb07ad167..df1be3e7cf8 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestBoostQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestBoostQuery.java index 6f1bf4fe149..427b2fc422e 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestBoostQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestBoostQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestCachingCollector.java b/lucene/core/src/test/org/apache/lucene/search/TestCachingCollector.java index 090f0a47ae4..18869196f8f 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestCachingCollector.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestCachingCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestComplexExplanations.java b/lucene/core/src/test/org/apache/lucene/search/TestComplexExplanations.java index fab966d6871..014566c7c60 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestComplexExplanations.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestComplexExplanations.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.util.ArrayList; import java.util.Arrays; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestComplexExplanationsOfNonMatches.java b/lucene/core/src/test/org/apache/lucene/search/TestComplexExplanationsOfNonMatches.java index 89d01bb9f5b..70ad9661db6 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestComplexExplanationsOfNonMatches.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestComplexExplanationsOfNonMatches.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + diff --git a/lucene/core/src/test/org/apache/lucene/search/TestConjunctionDISI.java b/lucene/core/src/test/org/apache/lucene/search/TestConjunctionDISI.java index 764461f53c5..269990d3398 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestConjunctionDISI.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestConjunctionDISI.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestConjunctions.java b/lucene/core/src/test/org/apache/lucene/search/TestConjunctions.java index a97dff69980..b6e0356e3ac 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestConjunctions.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestConjunctions.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreQuery.java index 4a1a60dfb0e..22532947898 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestConstantScoreQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.Collections; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestControlledRealTimeReopenThread.java b/lucene/core/src/test/org/apache/lucene/search/TestControlledRealTimeReopenThread.java index 2e1f385bbc9..f6a43c04088 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestControlledRealTimeReopenThread.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestControlledRealTimeReopenThread.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java b/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java index 26a92666f84..a9bac609621 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java @@ -1,11 +1,10 @@ -package org.apache.lucene.search; - /* - * Copyright 2005 The Apache Software Foundation - * - * Licensed 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 + * 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 * @@ -15,6 +14,7 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import java.io.IOException; import java.util.Calendar; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestDateSort.java b/lucene/core/src/test/org/apache/lucene/search/TestDateSort.java index b9adafad470..7c4785797e2 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestDateSort.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestDateSort.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.util.Arrays; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java index 34bf1ce0a78..7a9bb4e6e19 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestDisjunctionMaxQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.text.DecimalFormat; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestDocBoost.java b/lucene/core/src/test/org/apache/lucene/search/TestDocBoost.java index 6bd7510d83e..ecc46454194 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestDocBoost.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestDocBoost.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestDocValuesRewriteMethod.java b/lucene/core/src/test/org/apache/lucene/search/TestDocValuesRewriteMethod.java index 4b1f441c2f1..b2555ac2961 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestDocValuesRewriteMethod.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestDocValuesRewriteMethod.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestDocValuesScoring.java b/lucene/core/src/test/org/apache/lucene/search/TestDocValuesScoring.java index 92a9b86d4a4..b3cf567110d 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestDocValuesScoring.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestDocValuesScoring.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestEarlyTermination.java b/lucene/core/src/test/org/apache/lucene/search/TestEarlyTermination.java index c42ca4d5570..4a524916302 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestEarlyTermination.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestEarlyTermination.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestElevationComparator.java b/lucene/core/src/test/org/apache/lucene/search/TestElevationComparator.java index 3703f3e9b2d..7fdc3677b2d 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestElevationComparator.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestElevationComparator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheRewriteMethod.java b/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheRewriteMethod.java index 3cfb0d93ec9..9c0e153a03d 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheRewriteMethod.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheRewriteMethod.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestFieldValueQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestFieldValueQuery.java index cc2434762b6..b3478f5cd64 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestFieldValueQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestFieldValueQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java index 01371df7cea..7f36902b615 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestIndexSearcher.java b/lucene/core/src/test/org/apache/lucene/search/TestIndexSearcher.java index 45010e2be82..c561d64d8e0 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestIndexSearcher.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestIndexSearcher.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestLRUQueryCache.java b/lucene/core/src/test/org/apache/lucene/search/TestLRUQueryCache.java index db632dec758..b4ce86678ec 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestLRUQueryCache.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestLRUQueryCache.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.lang.reflect.Field; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestLiveFieldValues.java b/lucene/core/src/test/org/apache/lucene/search/TestLiveFieldValues.java index 0ddd6aa2a57..9346428fa2b 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestLiveFieldValues.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestLiveFieldValues.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMinShouldMatch2.java b/lucene/core/src/test/org/apache/lucene/search/TestMinShouldMatch2.java index a160ef852d0..f28997562ea 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestMinShouldMatch2.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestMinShouldMatch2.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMultiCollector.java b/lucene/core/src/test/org/apache/lucene/search/TestMultiCollector.java index 7ba1e001d72..9a142ffd826 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestMultiCollector.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestMultiCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseEnum.java b/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseEnum.java index a16e60abca5..aa0c86dde9e 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseEnum.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseEnum.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java index e12404ae19f..d2fec0e817f 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestMultiPhraseQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.LinkedList; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java b/lucene/core/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java index 4e4a810b6fa..21168053b4a 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.MockTokenizer; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java b/lucene/core/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java index 05996eef992..3772d451302 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestMultiTermQueryRewrites.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java b/lucene/core/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java index 3fc968c7b4b..d143bf74baa 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java index 47c259af0d6..eba37cefad2 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestMultiValuedNumericRangeQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.util.Locale; import java.text.DecimalFormat; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestMultiset.java b/lucene/core/src/test/org/apache/lucene/search/TestMultiset.java index ce65d85707a..33a751fd79e 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestMultiset.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestMultiset.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.util.HashMap; import java.util.Map; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestNGramPhraseQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestNGramPhraseQuery.java index 29c2d3ab498..a14bb2c7453 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestNGramPhraseQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestNGramPhraseQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestNeedsScores.java b/lucene/core/src/test/org/apache/lucene/search/TestNeedsScores.java index 6e753591e52..fa637593369 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestNeedsScores.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestNeedsScores.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.Set; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestNot.java b/lucene/core/src/test/org/apache/lucene/search/TestNot.java index cb0d28b96c1..8c88d8cd8a6 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestNot.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestNot.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import org.apache.lucene.document.Field; import org.apache.lucene.index.Term; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java b/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java index 1007b1ea6d2..3ddff3ac8a5 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java b/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java index 3c5531a3b41..19ff2404b5c 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java index e48df554596..3e8f9e1f84e 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestPhrasePrefixQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.LinkedList; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java index 28054fa70c5..c9f8f9749e0 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestPhraseQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestPointQueries.java b/lucene/core/src/test/org/apache/lucene/search/TestPointQueries.java index 15d4a0683f5..bbe0add8a05 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestPointQueries.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestPointQueries.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java b/lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java index afdfef3d34a..84468da4d3b 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestPositionIncrement.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.io.StringReader; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java b/lucene/core/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java index 1afaf961a7f..0612c0016ea 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestPositiveScoresOnlyCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import org.apache.lucene.document.Document; import org.apache.lucene.index.IndexReader; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java index b5921a7a5fb..d33bdaf46b5 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestPrefixInBooleanQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestPrefixQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestPrefixQuery.java index d23f7f44186..6ca41697182 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestPrefixQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestPrefixQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.util.ArrayList; import java.util.Collections; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java b/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java index 3754777d6a4..72fdc7aa689 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestPrefixRandom.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestQueryCachingPolicy.java b/lucene/core/src/test/org/apache/lucene/search/TestQueryCachingPolicy.java index 5fb5e97c26d..29ef6ba2e7c 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestQueryCachingPolicy.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestQueryCachingPolicy.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestQueryRescorer.java b/lucene/core/src/test/org/apache/lucene/search/TestQueryRescorer.java index 7cd32a3c58b..d029e017f6e 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestQueryRescorer.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestQueryRescorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestRegexpQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestRegexpQuery.java index 23fab2c82ce..b1cbe1e1f7c 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestRegexpQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestRegexpQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java b/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java index 7e78dd6934c..e16a426402f 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java b/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java index 348ff0c4a03..52e401204c2 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestRegexpRandom2.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestReqExclBulkScorer.java b/lucene/core/src/test/org/apache/lucene/search/TestReqExclBulkScorer.java index e86ba4a9029..20917dc13ca 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestReqExclBulkScorer.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestReqExclBulkScorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSameScoresWithThreads.java b/lucene/core/src/test/org/apache/lucene/search/TestSameScoresWithThreads.java index 014aae2cd88..83a11be8b7a 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSameScoresWithThreads.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSameScoresWithThreads.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.util.ArrayList; import java.util.Collections; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java b/lucene/core/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java index e924fcdf3d5..7951291596f 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestScoreCachingWrappingScorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestScorerPerf.java b/lucene/core/src/test/org/apache/lucene/search/TestScorerPerf.java index 73ebd40407b..82d5e1850b7 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestScorerPerf.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestScorerPerf.java @@ -1,3 +1,19 @@ +/* + * 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; import java.io.IOException; @@ -19,22 +35,6 @@ import org.apache.lucene.util.Bits; import org.apache.lucene.util.FixedBitSet; import org.apache.lucene.util.LuceneTestCase; -/* - * 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 TestScorerPerf extends LuceneTestCase { boolean validate = true; // set to false when doing performance testing diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSearchAfter.java b/lucene/core/src/test/org/apache/lucene/search/TestSearchAfter.java index 2d4adb83469..7017ddebfe1 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSearchAfter.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSearchAfter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSearchWithThreads.java b/lucene/core/src/test/org/apache/lucene/search/TestSearchWithThreads.java index bc3d9062eac..95c0b8ed6ea 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSearchWithThreads.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSearchWithThreads.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSearcherManager.java b/lucene/core/src/test/org/apache/lucene/search/TestSearcherManager.java index 76b56a56ba8..1fe1450a785 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSearcherManager.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSearcherManager.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestShardSearching.java b/lucene/core/src/test/org/apache/lucene/search/TestShardSearching.java index 29d1c60c04a..768ee0e1713 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestShardSearching.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestShardSearching.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSimilarity.java b/lucene/core/src/test/org/apache/lucene/search/TestSimilarity.java index f045f582c6d..27ffa6bf5b1 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSimilarity.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSimilarity.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import org.apache.lucene.document.Field; import org.apache.lucene.index.LeafReaderContext; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java b/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java index dc108ef7351..9278934a492 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSimilarityProvider.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanations.java b/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanations.java index 6d862d8ad08..9274fdfef8a 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanations.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanations.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.util.Arrays; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanationsOfNonMatches.java b/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanationsOfNonMatches.java index 307e12ccbc1..8a16243df40 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanationsOfNonMatches.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSimpleExplanationsOfNonMatches.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSimpleSearchEquivalence.java b/lucene/core/src/test/org/apache/lucene/search/TestSimpleSearchEquivalence.java index d67fb95031b..33007eb6408 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSimpleSearchEquivalence.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSimpleSearchEquivalence.java @@ -1,10 +1,3 @@ -package org.apache.lucene.search; - -import java.util.Arrays; - -import org.apache.lucene.index.Term; -import org.apache.lucene.search.BooleanClause.Occur; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -21,6 +14,13 @@ import org.apache.lucene.search.BooleanClause.Occur; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + +import java.util.Arrays; + +import org.apache.lucene.index.Term; +import org.apache.lucene.search.BooleanClause.Occur; + /** * Basic equivalence tests for core queries diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java index 4dcec7fd360..094278b164e 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery2.java b/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery2.java index ed7712fddd5..3910fac4518 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery2.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery2.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.util.Random; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSort.java b/lucene/core/src/test/org/apache/lucene/search/TestSort.java index d6311ada869..2543c1bc541 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSort.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSort.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java b/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java index d6b93d0f234..c362fd6e1c4 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSortRescorer.java b/lucene/core/src/test/org/apache/lucene/search/TestSortRescorer.java index cea048468fc..b2d435da466 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSortRescorer.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSortRescorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSortedNumericSortField.java b/lucene/core/src/test/org/apache/lucene/search/TestSortedNumericSortField.java index ecdce264cee..17954617235 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSortedNumericSortField.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSortedNumericSortField.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSelector.java b/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSelector.java index 9b2ac3df74d..82abf12f9ac 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSelector.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSelector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSortField.java b/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSortField.java index 0b46e894916..7b4ca2722eb 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSortField.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSortField.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java b/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java index f82a067fc15..121e48dcc74 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSubScorerFreqs.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.*; import java.util.*; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestSynonymQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestSynonymQuery.java index 38e618138b8..95e98659887 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestSynonymQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestSynonymQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java index e2a6d5b6724..97b04056f97 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestTermRangeQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.Set; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java b/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java index 2ab1e822d4f..cadc3ce2cbb 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestTermScorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java b/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java index 1ec8847fc4e..b98de806c99 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.BitSet; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTopDocsCollector.java b/lucene/core/src/test/org/apache/lucene/search/TestTopDocsCollector.java index 3171f2dcecc..9a769fe5c2a 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestTopDocsCollector.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestTopDocsCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTopDocsMerge.java b/lucene/core/src/test/org/apache/lucene/search/TestTopDocsMerge.java index 24e784bbafd..a5eafad343d 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestTopDocsMerge.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestTopDocsMerge.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java b/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java index 5b11ae2b7b9..4f5573dcf73 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestTotalHitCountCollector.java b/lucene/core/src/test/org/apache/lucene/search/TestTotalHitCountCollector.java index c2d3443186a..7bbd497b721 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestTotalHitCountCollector.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestTotalHitCountCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestUsageTrackingFilterCachingPolicy.java b/lucene/core/src/test/org/apache/lucene/search/TestUsageTrackingFilterCachingPolicy.java index 5da982ede98..33c94584e31 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestUsageTrackingFilterCachingPolicy.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestUsageTrackingFilterCachingPolicy.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import org.apache.lucene.index.MultiReader; import org.apache.lucene.index.SlowCompositeReaderWrapper; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestWildcard.java b/lucene/core/src/test/org/apache/lucene/search/TestWildcard.java index f812d01c922..3d77bc70cf8 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestWildcard.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestWildcard.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import org.apache.lucene.document.Field; import org.apache.lucene.store.Directory; diff --git a/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java b/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java index c7225068fda..ce476ca95f1 100644 --- a/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java +++ b/lucene/core/src/test/org/apache/lucene/search/TestWildcardRandom.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; diff --git a/lucene/core/src/test/org/apache/lucene/search/similarities/TestBM25Similarity.java b/lucene/core/src/test/org/apache/lucene/search/similarities/TestBM25Similarity.java index 68be891931c..f65397188bf 100644 --- a/lucene/core/src/test/org/apache/lucene/search/similarities/TestBM25Similarity.java +++ b/lucene/core/src/test/org/apache/lucene/search/similarities/TestBM25Similarity.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + import org.apache.lucene.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/search/similarities/TestClassicSimilarity.java b/lucene/core/src/test/org/apache/lucene/search/similarities/TestClassicSimilarity.java index b92b020b4fe..be07564d1d8 100644 --- a/lucene/core/src/test/org/apache/lucene/search/similarities/TestClassicSimilarity.java +++ b/lucene/core/src/test/org/apache/lucene/search/similarities/TestClassicSimilarity.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + import java.io.IOException; import java.util.Arrays; diff --git a/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarity2.java b/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarity2.java index fbd4359cf5d..8052923bb76 100644 --- a/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarity2.java +++ b/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarity2.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + import java.util.ArrayList; import java.util.List; diff --git a/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java b/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java index d62096ba372..829d30c848a 100644 --- a/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java +++ b/lucene/core/src/test/org/apache/lucene/search/similarities/TestSimilarityBase.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/test/org/apache/lucene/search/spans/JustCompileSearchSpans.java b/lucene/core/src/test/org/apache/lucene/search/spans/JustCompileSearchSpans.java index f075c1adc23..f844795d983 100644 --- a/lucene/core/src/test/org/apache/lucene/search/spans/JustCompileSearchSpans.java +++ b/lucene/core/src/test/org/apache/lucene/search/spans/JustCompileSearchSpans.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/search/spans/TestBasics.java b/lucene/core/src/test/org/apache/lucene/search/spans/TestBasics.java index 8479f375ee1..b18a38df2d5 100644 --- a/lucene/core/src/test/org/apache/lucene/search/spans/TestBasics.java +++ b/lucene/core/src/test/org/apache/lucene/search/spans/TestBasics.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java b/lucene/core/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java index 8bb84420486..052457b63ce 100644 --- a/lucene/core/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/spans/TestFieldMaskingSpanQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; + import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; diff --git a/lucene/core/src/test/org/apache/lucene/search/spans/TestFilterSpans.java b/lucene/core/src/test/org/apache/lucene/search/spans/TestFilterSpans.java index bc4b961d83a..2ec87ce46f0 100644 --- a/lucene/core/src/test/org/apache/lucene/search/spans/TestFilterSpans.java +++ b/lucene/core/src/test/org/apache/lucene/search/spans/TestFilterSpans.java @@ -1,21 +1,20 @@ -package org.apache.lucene.search.spans; - /* * 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 - * + * 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. + * 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.spans; import java.lang.reflect.Method; diff --git a/lucene/core/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java b/lucene/core/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java index 533d80e70da..b101c612162 100644 --- a/lucene/core/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java +++ b/lucene/core/src/test/org/apache/lucene/search/spans/TestNearSpansOrdered.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; + import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; diff --git a/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanBoostQuery.java b/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanBoostQuery.java index 2a337752781..e5111367a74 100644 --- a/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanBoostQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanBoostQuery.java @@ -1,8 +1,3 @@ -package org.apache.lucene.search.spans; - -import org.apache.lucene.index.Term; -import org.apache.lucene.util.LuceneTestCase; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -19,6 +14,11 @@ import org.apache.lucene.util.LuceneTestCase; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; + +import org.apache.lucene.index.Term; +import org.apache.lucene.util.LuceneTestCase; + public class TestSpanBoostQuery extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanCollection.java b/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanCollection.java index e12f99d832d..03fc40dda39 100644 --- a/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanCollection.java +++ b/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanCollection.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; + import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; diff --git a/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanContainQuery.java b/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanContainQuery.java index a27eb788b4e..c26070416c2 100644 --- a/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanContainQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanContainQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; + import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; diff --git a/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanExplanations.java b/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanExplanations.java index f0bd5b208f0..b986cd47300 100644 --- a/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanExplanations.java +++ b/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanExplanations.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; + import org.apache.lucene.search.*; diff --git a/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanExplanationsOfNonMatches.java b/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanExplanationsOfNonMatches.java index c4bbe410179..eeaf8e708b6 100644 --- a/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanExplanationsOfNonMatches.java +++ b/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanExplanationsOfNonMatches.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; + import org.apache.lucene.search.Query; diff --git a/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanFirstQuery.java b/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanFirstQuery.java index 8f9c460b2ec..228ad7989b3 100644 --- a/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanFirstQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanFirstQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; + import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.MockAnalyzer; diff --git a/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanMultiTermQueryWrapper.java b/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanMultiTermQueryWrapper.java index 386f29616f9..cedd7ff6ef7 100644 --- a/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanMultiTermQueryWrapper.java +++ b/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanMultiTermQueryWrapper.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanNearQuery.java b/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanNearQuery.java index 0a6b5121956..b010147c84e 100644 --- a/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanNearQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanNearQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanNotQuery.java b/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanNotQuery.java index 2f39a7283f4..79026bb1608 100644 --- a/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanNotQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanNotQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanOrQuery.java b/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanOrQuery.java index 0d0822ba577..6f3c41f9269 100644 --- a/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanOrQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanOrQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; + import org.apache.lucene.index.Term; import org.apache.lucene.search.QueryUtils; diff --git a/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanSearchEquivalence.java b/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanSearchEquivalence.java index 2c168f31f4d..7d7fbe47ef0 100644 --- a/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanSearchEquivalence.java +++ b/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanSearchEquivalence.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; + import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; diff --git a/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanTermQuery.java b/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanTermQuery.java index 7bf5f5a151c..97951bf7f8e 100644 --- a/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanTermQuery.java +++ b/lucene/core/src/test/org/apache/lucene/search/spans/TestSpanTermQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/search/spans/TestSpans.java b/lucene/core/src/test/org/apache/lucene/search/spans/TestSpans.java index c1a3f966156..9352f60b774 100644 --- a/lucene/core/src/test/org/apache/lucene/search/spans/TestSpans.java +++ b/lucene/core/src/test/org/apache/lucene/search/spans/TestSpans.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; + import java.io.IOException; import java.util.List; diff --git a/lucene/core/src/test/org/apache/lucene/search/spans/TestSpansEnum.java b/lucene/core/src/test/org/apache/lucene/search/spans/TestSpansEnum.java index adb3edc7807..10509a83694 100644 --- a/lucene/core/src/test/org/apache/lucene/search/spans/TestSpansEnum.java +++ b/lucene/core/src/test/org/apache/lucene/search/spans/TestSpansEnum.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/store/TestBufferedChecksum.java b/lucene/core/src/test/org/apache/lucene/store/TestBufferedChecksum.java index c7915d40b96..6ba8bb10f1e 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestBufferedChecksum.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestBufferedChecksum.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.util.zip.CRC32; import java.util.zip.Checksum; diff --git a/lucene/core/src/test/org/apache/lucene/store/TestBufferedIndexInput.java b/lucene/core/src/test/org/apache/lucene/store/TestBufferedIndexInput.java index ea2ec7cd322..cb443a1d1fc 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestBufferedIndexInput.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestBufferedIndexInput.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.IOException; import java.nio.file.Path; diff --git a/lucene/core/src/test/org/apache/lucene/store/TestByteArrayDataInput.java b/lucene/core/src/test/org/apache/lucene/store/TestByteArrayDataInput.java index 5d06cf54dcc..52f063efc86 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestByteArrayDataInput.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestByteArrayDataInput.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import org.apache.lucene.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/store/TestDirectory.java b/lucene/core/src/test/org/apache/lucene/store/TestDirectory.java index 8534fbffa50..c512482e96a 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestDirectory.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestDirectory.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.IOException; import java.nio.file.Files; diff --git a/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java b/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java index 60db126168a..ed5cc6e47af 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.IOException; import java.nio.file.Path; diff --git a/lucene/core/src/test/org/apache/lucene/store/TestFilterDirectory.java b/lucene/core/src/test/org/apache/lucene/store/TestFilterDirectory.java index 1b6021b6368..7fe9bc2be0d 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestFilterDirectory.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestFilterDirectory.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.IOException; import java.lang.reflect.Method; diff --git a/lucene/core/src/test/org/apache/lucene/store/TestHugeRamFile.java b/lucene/core/src/test/org/apache/lucene/store/TestHugeRamFile.java index 99c41ccc786..04c5900e365 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestHugeRamFile.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestHugeRamFile.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.IOException; import java.util.HashMap; diff --git a/lucene/core/src/test/org/apache/lucene/store/TestLockFactory.java b/lucene/core/src/test/org/apache/lucene/store/TestLockFactory.java index d3eca511afe..fa7a3fb1c05 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestLockFactory.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestLockFactory.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.IOException; import java.util.Collections; diff --git a/lucene/core/src/test/org/apache/lucene/store/TestMmapDirectory.java b/lucene/core/src/test/org/apache/lucene/store/TestMmapDirectory.java index a92c1c0ce01..9962ad1965b 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestMmapDirectory.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestMmapDirectory.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.IOException; import java.nio.file.Path; diff --git a/lucene/core/src/test/org/apache/lucene/store/TestMultiMMap.java b/lucene/core/src/test/org/apache/lucene/store/TestMultiMMap.java index 1abbe7c90c2..adea8ff6a62 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestMultiMMap.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestMultiMMap.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.IOException; import java.nio.file.Path; diff --git a/lucene/core/src/test/org/apache/lucene/store/TestNIOFSDirectory.java b/lucene/core/src/test/org/apache/lucene/store/TestNIOFSDirectory.java index 91d4c362e16..ae559a78181 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestNIOFSDirectory.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestNIOFSDirectory.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.IOException; import java.nio.file.Path; diff --git a/lucene/core/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java b/lucene/core/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java index bd025f3dae8..dfbb7b25d3d 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestNRTCachingDirectory.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestNRTCachingDirectory.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.IOException; import java.nio.file.Path; diff --git a/lucene/core/src/test/org/apache/lucene/store/TestNativeFSLockFactory.java b/lucene/core/src/test/org/apache/lucene/store/TestNativeFSLockFactory.java index b53707ee9c6..f8bbef5a8c3 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestNativeFSLockFactory.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestNativeFSLockFactory.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.IOException; import java.nio.file.Files; diff --git a/lucene/core/src/test/org/apache/lucene/store/TestRAMDirectory.java b/lucene/core/src/test/org/apache/lucene/store/TestRAMDirectory.java index 70cd0544409..4eba7d7f138 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestRAMDirectory.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestRAMDirectory.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.EOFException; import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/store/TestRateLimiter.java b/lucene/core/src/test/org/apache/lucene/store/TestRateLimiter.java index 60054e1f8b6..ca44bf04f77 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestRateLimiter.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestRateLimiter.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; diff --git a/lucene/core/src/test/org/apache/lucene/store/TestSimpleFSDirectory.java b/lucene/core/src/test/org/apache/lucene/store/TestSimpleFSDirectory.java index e8b62774434..eb82571b727 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestSimpleFSDirectory.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestSimpleFSDirectory.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.IOException; import java.nio.file.Path; diff --git a/lucene/core/src/test/org/apache/lucene/store/TestSimpleFSLockFactory.java b/lucene/core/src/test/org/apache/lucene/store/TestSimpleFSLockFactory.java index f05297e5778..c18ff718ec0 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestSimpleFSLockFactory.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestSimpleFSLockFactory.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.IOException; import java.nio.file.Path; diff --git a/lucene/core/src/test/org/apache/lucene/store/TestSingleInstanceLockFactory.java b/lucene/core/src/test/org/apache/lucene/store/TestSingleInstanceLockFactory.java index c9f4668862c..be0bef25ff5 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestSingleInstanceLockFactory.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestSingleInstanceLockFactory.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.IOException; import java.nio.file.Path; diff --git a/lucene/core/src/test/org/apache/lucene/store/TestSleepingLockWrapper.java b/lucene/core/src/test/org/apache/lucene/store/TestSleepingLockWrapper.java index c4608965f82..3b0ec3c75b7 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestSleepingLockWrapper.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestSleepingLockWrapper.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.IOException; import java.nio.file.Path; diff --git a/lucene/core/src/test/org/apache/lucene/store/TestTrackingDirectoryWrapper.java b/lucene/core/src/test/org/apache/lucene/store/TestTrackingDirectoryWrapper.java index 0985587eb84..a9574ce330e 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestTrackingDirectoryWrapper.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestTrackingDirectoryWrapper.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.io.IOException; import java.nio.file.Path; diff --git a/lucene/core/src/test/org/apache/lucene/store/TestWindowsMMap.java b/lucene/core/src/test/org/apache/lucene/store/TestWindowsMMap.java index 8cea53bca61..09636e68150 100644 --- a/lucene/core/src/test/org/apache/lucene/store/TestWindowsMMap.java +++ b/lucene/core/src/test/org/apache/lucene/store/TestWindowsMMap.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 @@ -16,6 +14,8 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + import java.nio.file.Path; diff --git a/lucene/core/src/test/org/apache/lucene/util/BaseSortTestCase.java b/lucene/core/src/test/org/apache/lucene/util/BaseSortTestCase.java index dec5ddf6e5c..2db901baa1a 100644 --- a/lucene/core/src/test/org/apache/lucene/util/BaseSortTestCase.java +++ b/lucene/core/src/test/org/apache/lucene/util/BaseSortTestCase.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.util.Arrays; diff --git a/lucene/core/src/test/org/apache/lucene/util/StressRamUsageEstimator.java b/lucene/core/src/test/org/apache/lucene/util/StressRamUsageEstimator.java index 87ee1487e92..7a2712fcbd2 100644 --- a/lucene/core/src/test/org/apache/lucene/util/StressRamUsageEstimator.java +++ b/lucene/core/src/test/org/apache/lucene/util/StressRamUsageEstimator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.util.Arrays; diff --git a/lucene/core/src/test/org/apache/lucene/util/Test2BPagedBytes.java b/lucene/core/src/test/org/apache/lucene/util/Test2BPagedBytes.java index 45628e1c596..073aed6e8a5 100644 --- a/lucene/core/src/test/org/apache/lucene/util/Test2BPagedBytes.java +++ b/lucene/core/src/test/org/apache/lucene/util/Test2BPagedBytes.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.util.Random; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestArrayUtil.java b/lucene/core/src/test/org/apache/lucene/util/TestArrayUtil.java index e6093e191ad..c289120bbf2 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestArrayUtil.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestArrayUtil.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.util.Arrays; import java.util.Collections; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestAttributeSource.java b/lucene/core/src/test/org/apache/lucene/util/TestAttributeSource.java index 716e4a837bf..83becc740f7 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestAttributeSource.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestAttributeSource.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenStream; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestByteBlockPool.java b/lucene/core/src/test/org/apache/lucene/util/TestByteBlockPool.java index d03f066147b..b425b761877 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestByteBlockPool.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestByteBlockPool.java @@ -1,25 +1,25 @@ +/* + * 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.util; import java.io.IOException; import java.util.ArrayList; import java.util.List; -/* - * 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 TestByteBlockPool extends LuceneTestCase { public void testReadAndWrite() throws IOException { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestBytesRef.java b/lucene/core/src/test/org/apache/lucene/util/TestBytesRef.java index 7ba9b0edfb7..3a5bb53c742 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestBytesRef.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestBytesRef.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + public class TestBytesRef extends LuceneTestCase { public void testEmpty() { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestBytesRefArray.java b/lucene/core/src/test/org/apache/lucene/util/TestBytesRefArray.java index 84b3256a968..f2e7b601e6f 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestBytesRefArray.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestBytesRefArray.java @@ -1,21 +1,20 @@ -package org.apache.lucene.util; - /* * 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 - * + * 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. + * 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.util; import java.io.IOException; import java.util.*; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestBytesRefHash.java b/lucene/core/src/test/org/apache/lucene/util/TestBytesRefHash.java index b1b3891e3bb..e44b283a44b 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestBytesRefHash.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestBytesRefHash.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.util.BitSet; import java.util.HashMap; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestCharsRef.java b/lucene/core/src/test/org/apache/lucene/util/TestCharsRef.java index 2c9f29cee52..c9e5a38a8a6 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestCharsRef.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestCharsRef.java @@ -1,7 +1,3 @@ -package org.apache.lucene.util; - -import java.util.Arrays; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,10 @@ import java.util.Arrays; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + +import java.util.Arrays; + public class TestCharsRef extends LuceneTestCase { public void testUTF16InUTF8Order() { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestCharsRefBuilder.java b/lucene/core/src/test/org/apache/lucene/util/TestCharsRefBuilder.java index 184a3b031ae..fc96d8aa0e9 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestCharsRefBuilder.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestCharsRefBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + public class TestCharsRefBuilder extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestCloseableThreadLocal.java b/lucene/core/src/test/org/apache/lucene/util/TestCloseableThreadLocal.java index c093722bd86..9f56d7b45ed 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestCloseableThreadLocal.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestCloseableThreadLocal.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.util; public class TestCloseableThreadLocal extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestCollectionUtil.java b/lucene/core/src/test/org/apache/lucene/util/TestCollectionUtil.java index 013e8542bfc..1af1efde7f9 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestCollectionUtil.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestCollectionUtil.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.util.Arrays; import java.util.ArrayList; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestDocIdSetBuilder.java b/lucene/core/src/test/org/apache/lucene/util/TestDocIdSetBuilder.java index 4a4afa71db4..97afe8b1854 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestDocIdSetBuilder.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestDocIdSetBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestFilterIterator.java b/lucene/core/src/test/org/apache/lucene/util/TestFilterIterator.java index a5486e14db1..d2340cb1167 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestFilterIterator.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestFilterIterator.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.util; import java.util.Arrays; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestFixedBitDocIdSet.java b/lucene/core/src/test/org/apache/lucene/util/TestFixedBitDocIdSet.java index 6afb386b150..e5d27b2ba51 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestFixedBitDocIdSet.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestFixedBitDocIdSet.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.util; import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestFixedBitSet.java b/lucene/core/src/test/org/apache/lucene/util/TestFixedBitSet.java index 129ce3b92ce..4c91187884c 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestFixedBitSet.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestFixedBitSet.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.io.IOException; import java.util.Random; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestFrequencyTrackingRingBuffer.java b/lucene/core/src/test/org/apache/lucene/util/TestFrequencyTrackingRingBuffer.java index 5fe1a499cd1..81b7ac553f1 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestFrequencyTrackingRingBuffer.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestFrequencyTrackingRingBuffer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.util.ArrayList; import java.util.HashMap; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestIOUtils.java b/lucene/core/src/test/org/apache/lucene/util/TestIOUtils.java index 7a112cd2f65..ec4f7a5f0b8 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestIOUtils.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestIOUtils.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.io.IOException; import java.io.OutputStream; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestInPlaceMergeSorter.java b/lucene/core/src/test/org/apache/lucene/util/TestInPlaceMergeSorter.java index d6e5f464624..ed8e0303adb 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestInPlaceMergeSorter.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestInPlaceMergeSorter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import org.junit.runner.RunWith; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestIntArrayDocIdSet.java b/lucene/core/src/test/org/apache/lucene/util/TestIntArrayDocIdSet.java index 4320e9fa770..2a7d2e61476 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestIntArrayDocIdSet.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestIntArrayDocIdSet.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.io.IOException; import java.util.BitSet; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestIntroSorter.java b/lucene/core/src/test/org/apache/lucene/util/TestIntroSorter.java index eb4316e2267..56022d2ee9a 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestIntroSorter.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestIntroSorter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + public class TestIntroSorter extends BaseSortTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestIntsRef.java b/lucene/core/src/test/org/apache/lucene/util/TestIntsRef.java index 1b37873ee86..b9976592fa0 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestIntsRef.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestIntsRef.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + public class TestIntsRef extends LuceneTestCase { public void testEmpty() { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestLSBRadixSorter.java b/lucene/core/src/test/org/apache/lucene/util/TestLSBRadixSorter.java index 5582e5844c2..020bc503b6f 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestLSBRadixSorter.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestLSBRadixSorter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.util.Arrays; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestLegacyNumericUtils.java b/lucene/core/src/test/org/apache/lucene/util/TestLegacyNumericUtils.java index cab77e5079c..ce32352aab4 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestLegacyNumericUtils.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestLegacyNumericUtils.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.util.Arrays; import java.util.Collections; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestLongBitSet.java b/lucene/core/src/test/org/apache/lucene/util/TestLongBitSet.java index 018a7d59c92..cf4d1a74fe2 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestLongBitSet.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestLongBitSet.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestMathUtil.java b/lucene/core/src/test/org/apache/lucene/util/TestMathUtil.java index f823aad10b0..2b62ca666cd 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestMathUtil.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestMathUtil.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.math.BigInteger; import java.util.Arrays; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestMergedIterator.java b/lucene/core/src/test/org/apache/lucene/util/TestMergedIterator.java index 98670987e75..983cf7277b4 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestMergedIterator.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestMergedIterator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.util.ArrayList; import java.util.Iterator; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestNamedSPILoader.java b/lucene/core/src/test/org/apache/lucene/util/TestNamedSPILoader.java index 4a2af47dd56..3194e7bd8de 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestNamedSPILoader.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestNamedSPILoader.java @@ -1,9 +1,3 @@ -package org.apache.lucene.util; - -import java.util.Set; - -import org.apache.lucene.codecs.Codec; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -20,6 +14,12 @@ import org.apache.lucene.codecs.Codec; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + +import java.util.Set; + +import org.apache.lucene.codecs.Codec; + // TODO: maybe we should test this with mocks, but it's easy // enough to test the basics via Codec diff --git a/lucene/core/src/test/org/apache/lucene/util/TestNotDocIdSet.java b/lucene/core/src/test/org/apache/lucene/util/TestNotDocIdSet.java index 5df0cdef2cf..7650348960d 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestNotDocIdSet.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestNotDocIdSet.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.io.IOException; import java.util.BitSet; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestOfflineSorter.java b/lucene/core/src/test/org/apache/lucene/util/TestOfflineSorter.java index d8a878cba98..63374cf9052 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestOfflineSorter.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestOfflineSorter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestPagedBytes.java b/lucene/core/src/test/org/apache/lucene/util/TestPagedBytes.java index a2a0cccc58d..5f135d4ec0a 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestPagedBytes.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestPagedBytes.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.util; import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestPriorityQueue.java b/lucene/core/src/test/org/apache/lucene/util/TestPriorityQueue.java index ca8dba70023..cd202feb826 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestPriorityQueue.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestPriorityQueue.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.util.ArrayList; import java.util.Iterator; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestQueryBuilder.java b/lucene/core/src/test/org/apache/lucene/util/TestQueryBuilder.java index 1ce16631ac6..bd5a49a0a12 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestQueryBuilder.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestQueryBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestRamUsageEstimator.java b/lucene/core/src/test/org/apache/lucene/util/TestRamUsageEstimator.java index fc9a48fb095..cf53c2d242e 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestRamUsageEstimator.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestRamUsageEstimator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import static org.apache.lucene.util.RamUsageEstimator.*; import static org.apache.lucene.util.RamUsageTester.sizeOf; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestRecyclingByteBlockAllocator.java b/lucene/core/src/test/org/apache/lucene/util/TestRecyclingByteBlockAllocator.java index db1044f1965..7dffba04228 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestRecyclingByteBlockAllocator.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestRecyclingByteBlockAllocator.java @@ -1,12 +1,3 @@ -package org.apache.lucene.util; - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.concurrent.atomic.AtomicLong; -import org.junit.Before; -import org.junit.Test; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -23,6 +14,15 @@ import org.junit.Test; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.concurrent.atomic.AtomicLong; +import org.junit.Before; +import org.junit.Test; + /** * Testcase for {@link RecyclingByteBlockAllocator} diff --git a/lucene/core/src/test/org/apache/lucene/util/TestRecyclingIntBlockAllocator.java b/lucene/core/src/test/org/apache/lucene/util/TestRecyclingIntBlockAllocator.java index 1ea670200c2..89f0dbe8298 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestRecyclingIntBlockAllocator.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestRecyclingIntBlockAllocator.java @@ -1,12 +1,3 @@ -package org.apache.lucene.util; - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.concurrent.atomic.AtomicLong; -import org.junit.Before; -import org.junit.Test; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -23,6 +14,15 @@ import org.junit.Test; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.concurrent.atomic.AtomicLong; +import org.junit.Before; +import org.junit.Test; + /** * Testcase for {@link RecyclingIntBlockAllocator} diff --git a/lucene/core/src/test/org/apache/lucene/util/TestRoaringDocIdSet.java b/lucene/core/src/test/org/apache/lucene/util/TestRoaringDocIdSet.java index 4235add961a..e63e26a3931 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestRoaringDocIdSet.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestRoaringDocIdSet.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.io.IOException; import java.util.BitSet; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestRollingBuffer.java b/lucene/core/src/test/org/apache/lucene/util/TestRollingBuffer.java index 146c4907d48..6a28b61fc81 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestRollingBuffer.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestRollingBuffer.java @@ -1,7 +1,3 @@ -package org.apache.lucene.util; - -import java.util.Random; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,10 @@ import java.util.Random; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + +import java.util.Random; + public class TestRollingBuffer extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestSPIClassIterator.java b/lucene/core/src/test/org/apache/lucene/util/TestSPIClassIterator.java index ac57b970342..9bbe90746a8 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestSPIClassIterator.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestSPIClassIterator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.net.URL; import java.net.URLClassLoader; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestSentinelIntSet.java b/lucene/core/src/test/org/apache/lucene/util/TestSentinelIntSet.java index 00a5bb8259d..3a5c975aee2 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestSentinelIntSet.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestSentinelIntSet.java @@ -1,6 +1,3 @@ -package org.apache.lucene.util; - - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +14,9 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + + import org.junit.Test; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestSetOnce.java b/lucene/core/src/test/org/apache/lucene/util/TestSetOnce.java index 1ee0e6d87a7..b072a73397a 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestSetOnce.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestSetOnce.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.util.Random; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestSloppyMath.java b/lucene/core/src/test/org/apache/lucene/util/TestSloppyMath.java index ccba22d9a60..7df2f78682f 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestSloppyMath.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestSloppyMath.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import static org.apache.lucene.util.SloppyMath.cos; import static org.apache.lucene.util.SloppyMath.asin; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestSmallFloat.java b/lucene/core/src/test/org/apache/lucene/util/TestSmallFloat.java index 55bf1803d20..86c6bb812b0 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestSmallFloat.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestSmallFloat.java @@ -1,11 +1,10 @@ -package org.apache.lucene.util; - /* - * Copyright 2005 The Apache Software Foundation - * - * Licensed 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 + * 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 * @@ -15,6 +14,7 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; public class TestSmallFloat extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestSparseFixedBitDocIdSet.java b/lucene/core/src/test/org/apache/lucene/util/TestSparseFixedBitDocIdSet.java index fc0d136fd7e..310a2348de0 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestSparseFixedBitDocIdSet.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestSparseFixedBitDocIdSet.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestSparseFixedBitSet.java b/lucene/core/src/test/org/apache/lucene/util/TestSparseFixedBitSet.java index 86249136489..581646e9dc6 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestSparseFixedBitSet.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestSparseFixedBitSet.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestStringHelper.java b/lucene/core/src/test/org/apache/lucene/util/TestStringHelper.java index be425e0d6fa..58c3030b922 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestStringHelper.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestStringHelper.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + public class TestStringHelper extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestTimSorter.java b/lucene/core/src/test/org/apache/lucene/util/TestTimSorter.java index 15b5b09424b..59c0b9135b0 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestTimSorter.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestTimSorter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + public class TestTimSorter extends BaseSortTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestTimSorterWorstCase.java b/lucene/core/src/test/org/apache/lucene/util/TestTimSorterWorstCase.java index 621ccd6a532..5ab397d2457 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestTimSorterWorstCase.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestTimSorterWorstCase.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.util.LinkedList; import java.util.List; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestUnicodeUtil.java b/lucene/core/src/test/org/apache/lucene/util/TestUnicodeUtil.java index 456e0f467bf..0ef25eefe7a 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestUnicodeUtil.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestUnicodeUtil.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + /* * Some of this code came from the excellent Unicode diff --git a/lucene/core/src/test/org/apache/lucene/util/TestVersion.java b/lucene/core/src/test/org/apache/lucene/util/TestVersion.java index a9643a37db2..fd02ce2b066 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestVersion.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestVersion.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + import java.lang.reflect.Field; import java.lang.reflect.Modifier; diff --git a/lucene/core/src/test/org/apache/lucene/util/TestVirtualMethod.java b/lucene/core/src/test/org/apache/lucene/util/TestVirtualMethod.java index 1f365f2bb5b..38d217dd77f 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestVirtualMethod.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestVirtualMethod.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + public class TestVirtualMethod extends LuceneTestCase { diff --git a/lucene/core/src/test/org/apache/lucene/util/TestWeakIdentityMap.java b/lucene/core/src/test/org/apache/lucene/util/TestWeakIdentityMap.java index 0173e0abe0b..4e0c7a5cf2f 100644 --- a/lucene/core/src/test/org/apache/lucene/util/TestWeakIdentityMap.java +++ b/lucene/core/src/test/org/apache/lucene/util/TestWeakIdentityMap.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.util; import java.util.Iterator; diff --git a/lucene/core/src/test/org/apache/lucene/util/automaton/FiniteStringsIteratorTest.java b/lucene/core/src/test/org/apache/lucene/util/automaton/FiniteStringsIteratorTest.java index 01cd988851c..57113d086e4 100644 --- a/lucene/core/src/test/org/apache/lucene/util/automaton/FiniteStringsIteratorTest.java +++ b/lucene/core/src/test/org/apache/lucene/util/automaton/FiniteStringsIteratorTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.automaton; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.automaton; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.automaton; + import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IntsRef; diff --git a/lucene/core/src/test/org/apache/lucene/util/automaton/LimitedFiniteStringsIteratorTest.java b/lucene/core/src/test/org/apache/lucene/util/automaton/LimitedFiniteStringsIteratorTest.java index abf380feead..ddaa65a2827 100644 --- a/lucene/core/src/test/org/apache/lucene/util/automaton/LimitedFiniteStringsIteratorTest.java +++ b/lucene/core/src/test/org/apache/lucene/util/automaton/LimitedFiniteStringsIteratorTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.automaton; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.automaton; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.automaton; + import java.util.List; diff --git a/lucene/core/src/test/org/apache/lucene/util/automaton/TestAutomaton.java b/lucene/core/src/test/org/apache/lucene/util/automaton/TestAutomaton.java index d0bfae247b6..83c573800fe 100644 --- a/lucene/core/src/test/org/apache/lucene/util/automaton/TestAutomaton.java +++ b/lucene/core/src/test/org/apache/lucene/util/automaton/TestAutomaton.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.automaton; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.automaton; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.automaton; + import java.util.ArrayList; import java.util.Arrays; diff --git a/lucene/core/src/test/org/apache/lucene/util/automaton/TestCompiledAutomaton.java b/lucene/core/src/test/org/apache/lucene/util/automaton/TestCompiledAutomaton.java index 84143ead256..3a65cb87591 100644 --- a/lucene/core/src/test/org/apache/lucene/util/automaton/TestCompiledAutomaton.java +++ b/lucene/core/src/test/org/apache/lucene/util/automaton/TestCompiledAutomaton.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.automaton; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.automaton; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.automaton; + import java.util.ArrayList; import java.util.Arrays; diff --git a/lucene/core/src/test/org/apache/lucene/util/automaton/TestDeterminism.java b/lucene/core/src/test/org/apache/lucene/util/automaton/TestDeterminism.java index 4a46c88e5ee..8c53b476533 100644 --- a/lucene/core/src/test/org/apache/lucene/util/automaton/TestDeterminism.java +++ b/lucene/core/src/test/org/apache/lucene/util/automaton/TestDeterminism.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.automaton; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.automaton; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.automaton; + import org.apache.lucene.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/util/automaton/TestDeterminizeLexicon.java b/lucene/core/src/test/org/apache/lucene/util/automaton/TestDeterminizeLexicon.java index 85a12e9e1ad..1440b1910ee 100644 --- a/lucene/core/src/test/org/apache/lucene/util/automaton/TestDeterminizeLexicon.java +++ b/lucene/core/src/test/org/apache/lucene/util/automaton/TestDeterminizeLexicon.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.automaton; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.automaton; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.automaton; + import java.nio.charset.StandardCharsets; import java.util.ArrayList; diff --git a/lucene/core/src/test/org/apache/lucene/util/automaton/TestLevenshteinAutomata.java b/lucene/core/src/test/org/apache/lucene/util/automaton/TestLevenshteinAutomata.java index a5e759af29d..816a53a00cd 100644 --- a/lucene/core/src/test/org/apache/lucene/util/automaton/TestLevenshteinAutomata.java +++ b/lucene/core/src/test/org/apache/lucene/util/automaton/TestLevenshteinAutomata.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.automaton; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.automaton; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.automaton; + import java.util.ArrayList; import java.util.List; diff --git a/lucene/core/src/test/org/apache/lucene/util/automaton/TestMinimize.java b/lucene/core/src/test/org/apache/lucene/util/automaton/TestMinimize.java index 5dd5a9cc1d0..2da14df50ce 100644 --- a/lucene/core/src/test/org/apache/lucene/util/automaton/TestMinimize.java +++ b/lucene/core/src/test/org/apache/lucene/util/automaton/TestMinimize.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.automaton; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.automaton; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.automaton; + import org.apache.lucene.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/util/automaton/TestOperations.java b/lucene/core/src/test/org/apache/lucene/util/automaton/TestOperations.java index 926f4892bcd..c9489e9ac11 100644 --- a/lucene/core/src/test/org/apache/lucene/util/automaton/TestOperations.java +++ b/lucene/core/src/test/org/apache/lucene/util/automaton/TestOperations.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.automaton; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.automaton; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.automaton; + import java.util.*; diff --git a/lucene/core/src/test/org/apache/lucene/util/automaton/TestRegExp.java b/lucene/core/src/test/org/apache/lucene/util/automaton/TestRegExp.java index 331bb595b01..afb8e36001e 100644 --- a/lucene/core/src/test/org/apache/lucene/util/automaton/TestRegExp.java +++ b/lucene/core/src/test/org/apache/lucene/util/automaton/TestRegExp.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.automaton; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.automaton; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.automaton; + import org.apache.lucene.util.LuceneTestCase; diff --git a/lucene/core/src/test/org/apache/lucene/util/automaton/TestUTF32ToUTF8.java b/lucene/core/src/test/org/apache/lucene/util/automaton/TestUTF32ToUTF8.java index d823b3aa300..83c614ce22d 100644 --- a/lucene/core/src/test/org/apache/lucene/util/automaton/TestUTF32ToUTF8.java +++ b/lucene/core/src/test/org/apache/lucene/util/automaton/TestUTF32ToUTF8.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.automaton; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.automaton; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.automaton; + import java.nio.charset.StandardCharsets; import java.util.HashSet; diff --git a/lucene/core/src/test/org/apache/lucene/util/bkd/TestBKD.java b/lucene/core/src/test/org/apache/lucene/util/bkd/TestBKD.java index 3448150f4ff..5afebbad674 100644 --- a/lucene/core/src/test/org/apache/lucene/util/bkd/TestBKD.java +++ b/lucene/core/src/test/org/apache/lucene/util/bkd/TestBKD.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.bkd; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.bkd; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.bkd; + import java.io.IOException; import java.math.BigInteger; diff --git a/lucene/core/src/test/org/apache/lucene/util/fst/Test2BFST.java b/lucene/core/src/test/org/apache/lucene/util/fst/Test2BFST.java index 57d8374602b..79313e0da93 100644 --- a/lucene/core/src/test/org/apache/lucene/util/fst/Test2BFST.java +++ b/lucene/core/src/test/org/apache/lucene/util/fst/Test2BFST.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.fst; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.fst; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.fst; + import java.util.Arrays; import java.util.Random; diff --git a/lucene/core/src/test/org/apache/lucene/util/fst/TestBytesStore.java b/lucene/core/src/test/org/apache/lucene/util/fst/TestBytesStore.java index f5db2b610fc..ce5a52ba6dd 100644 --- a/lucene/core/src/test/org/apache/lucene/util/fst/TestBytesStore.java +++ b/lucene/core/src/test/org/apache/lucene/util/fst/TestBytesStore.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.fst; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.fst; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.fst; + import java.util.Arrays; diff --git a/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java b/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java index 27dd1697167..6086ed78394 100644 --- a/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java +++ b/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.fst; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.fst; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.fst; + import java.io.BufferedReader; import java.io.IOException; diff --git a/lucene/core/src/test/org/apache/lucene/util/packed/TestDirectMonotonic.java b/lucene/core/src/test/org/apache/lucene/util/packed/TestDirectMonotonic.java index 159ceb99b23..5cad155c723 100644 --- a/lucene/core/src/test/org/apache/lucene/util/packed/TestDirectMonotonic.java +++ b/lucene/core/src/test/org/apache/lucene/util/packed/TestDirectMonotonic.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/core/src/test/org/apache/lucene/util/packed/TestDirectPacked.java b/lucene/core/src/test/org/apache/lucene/util/packed/TestDirectPacked.java index 7127a15cc68..4d72a69c283 100644 --- a/lucene/core/src/test/org/apache/lucene/util/packed/TestDirectPacked.java +++ b/lucene/core/src/test/org/apache/lucene/util/packed/TestDirectPacked.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; + import java.util.Random; diff --git a/lucene/core/src/test/org/apache/lucene/util/packed/TestPackedInts.java b/lucene/core/src/test/org/apache/lucene/util/packed/TestPackedInts.java index bab144b7cfc..40621346eed 100644 --- a/lucene/core/src/test/org/apache/lucene/util/packed/TestPackedInts.java +++ b/lucene/core/src/test/org/apache/lucene/util/packed/TestPackedInts.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.packed; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.util.packed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.packed; + import java.io.IOException; import java.nio.ByteBuffer; diff --git a/lucene/demo/src/java/org/apache/lucene/demo/IndexFiles.java b/lucene/demo/src/java/org/apache/lucene/demo/IndexFiles.java index b8d8a9ea3ec..ddaf4d25861 100644 --- a/lucene/demo/src/java/org/apache/lucene/demo/IndexFiles.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/IndexFiles.java @@ -1,5 +1,3 @@ -package org.apache.lucene.demo; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.demo; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.demo; + import java.io.BufferedReader; import java.io.IOException; diff --git a/lucene/demo/src/java/org/apache/lucene/demo/SearchFiles.java b/lucene/demo/src/java/org/apache/lucene/demo/SearchFiles.java index dcc18a9b47c..46c75e14675 100644 --- a/lucene/demo/src/java/org/apache/lucene/demo/SearchFiles.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/SearchFiles.java @@ -1,5 +1,3 @@ -package org.apache.lucene.demo; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.demo; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.demo; + import java.io.BufferedReader; import java.io.IOException; diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/AssociationsFacetsExample.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/AssociationsFacetsExample.java index 66ede10bfc0..3e2737d0c8f 100644 --- a/lucene/demo/src/java/org/apache/lucene/demo/facet/AssociationsFacetsExample.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/AssociationsFacetsExample.java @@ -1,5 +1,3 @@ -package org.apache.lucene.demo.facet; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.demo.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.demo.facet; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/DistanceFacetsExample.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/DistanceFacetsExample.java index c183074f1d8..bf3f1854eb3 100644 --- a/lucene/demo/src/java/org/apache/lucene/demo/facet/DistanceFacetsExample.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/DistanceFacetsExample.java @@ -1,5 +1,3 @@ -package org.apache.lucene.demo.facet; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.demo.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.demo.facet; + import org.apache.lucene.analysis.core.WhitespaceAnalyzer; import org.apache.lucene.document.DoublePoint; diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/ExpressionAggregationFacetsExample.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/ExpressionAggregationFacetsExample.java index b5f1657d5fd..fca7b6c6b65 100644 --- a/lucene/demo/src/java/org/apache/lucene/demo/facet/ExpressionAggregationFacetsExample.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/ExpressionAggregationFacetsExample.java @@ -1,3 +1,19 @@ +/* + * 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.demo.facet; import java.io.IOException; @@ -30,22 +46,6 @@ import org.apache.lucene.search.SortField; import org.apache.lucene.store.Directory; import org.apache.lucene.store.RAMDirectory; -/* - * 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. - */ /** Shows facets aggregation by an expression. */ public class ExpressionAggregationFacetsExample { diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/MultiCategoryListsFacetsExample.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/MultiCategoryListsFacetsExample.java index 7f8c0c6c698..c3647976a95 100644 --- a/lucene/demo/src/java/org/apache/lucene/demo/facet/MultiCategoryListsFacetsExample.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/MultiCategoryListsFacetsExample.java @@ -1,5 +1,3 @@ -package org.apache.lucene.demo.facet; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.demo.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.demo.facet; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/RangeFacetsExample.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/RangeFacetsExample.java index 6c6b3f41a19..cbc19b896fc 100644 --- a/lucene/demo/src/java/org/apache/lucene/demo/facet/RangeFacetsExample.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/RangeFacetsExample.java @@ -1,5 +1,3 @@ -package org.apache.lucene.demo.facet; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.demo.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.demo.facet; + import org.apache.lucene.analysis.core.WhitespaceAnalyzer; import org.apache.lucene.document.LongPoint; diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleFacetsExample.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleFacetsExample.java index 7a6a36ec653..df424cb5342 100644 --- a/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleFacetsExample.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleFacetsExample.java @@ -1,5 +1,3 @@ -package org.apache.lucene.demo.facet; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.demo.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.demo.facet; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleSortedSetFacetsExample.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleSortedSetFacetsExample.java index 0c301e588b7..06b9bf42acd 100644 --- a/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleSortedSetFacetsExample.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/SimpleSortedSetFacetsExample.java @@ -1,5 +1,3 @@ -package org.apache.lucene.demo.facet; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.demo.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.demo.facet; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/package-info.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/package-info.java index af74d23e2a1..4252e0ebc6c 100644 --- a/lucene/demo/src/java/org/apache/lucene/demo/facet/package-info.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Facets example code. */ diff --git a/lucene/demo/src/java/org/apache/lucene/demo/package-info.java b/lucene/demo/src/java/org/apache/lucene/demo/package-info.java index 77f76dd3ed2..e78e3f0626c 100644 --- a/lucene/demo/src/java/org/apache/lucene/demo/package-info.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Demo applications for indexing and searching. */ diff --git a/lucene/demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java b/lucene/demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java index 4874acc708c..8e8371c64b1 100644 --- a/lucene/demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.demo.xmlparser; import java.io.BufferedReader; diff --git a/lucene/demo/src/java/org/apache/lucene/demo/xmlparser/package-info.java b/lucene/demo/src/java/org/apache/lucene/demo/xmlparser/package-info.java index 0b569dcff1c..adf284e38a3 100644 --- a/lucene/demo/src/java/org/apache/lucene/demo/xmlparser/package-info.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/xmlparser/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Demo servlet for the XML Query Parser. */ diff --git a/lucene/demo/src/test/org/apache/lucene/demo/TestDemo.java b/lucene/demo/src/test/org/apache/lucene/demo/TestDemo.java index a51231963cd..6ee4add0dec 100644 --- a/lucene/demo/src/test/org/apache/lucene/demo/TestDemo.java +++ b/lucene/demo/src/test/org/apache/lucene/demo/TestDemo.java @@ -1,5 +1,3 @@ -package org.apache.lucene.demo; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.demo; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.demo; + import java.io.ByteArrayOutputStream; import java.io.File; diff --git a/lucene/demo/src/test/org/apache/lucene/demo/facet/TestAssociationsFacetsExample.java b/lucene/demo/src/test/org/apache/lucene/demo/facet/TestAssociationsFacetsExample.java index 1ae1c430b47..52fa7f246ce 100644 --- a/lucene/demo/src/test/org/apache/lucene/demo/facet/TestAssociationsFacetsExample.java +++ b/lucene/demo/src/test/org/apache/lucene/demo/facet/TestAssociationsFacetsExample.java @@ -1,5 +1,3 @@ -package org.apache.lucene.demo.facet; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.demo.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.demo.facet; + import java.util.List; diff --git a/lucene/demo/src/test/org/apache/lucene/demo/facet/TestDistanceFacetsExample.java b/lucene/demo/src/test/org/apache/lucene/demo/facet/TestDistanceFacetsExample.java index 3eb20c7af5d..ced51716c5b 100644 --- a/lucene/demo/src/test/org/apache/lucene/demo/facet/TestDistanceFacetsExample.java +++ b/lucene/demo/src/test/org/apache/lucene/demo/facet/TestDistanceFacetsExample.java @@ -1,5 +1,3 @@ -package org.apache.lucene.demo.facet; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.demo.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.demo.facet; + import org.apache.lucene.facet.FacetResult; diff --git a/lucene/demo/src/test/org/apache/lucene/demo/facet/TestExpressionAggregationFacetsExample.java b/lucene/demo/src/test/org/apache/lucene/demo/facet/TestExpressionAggregationFacetsExample.java index 2cc7029455e..0c052cea3a2 100644 --- a/lucene/demo/src/test/org/apache/lucene/demo/facet/TestExpressionAggregationFacetsExample.java +++ b/lucene/demo/src/test/org/apache/lucene/demo/facet/TestExpressionAggregationFacetsExample.java @@ -1,5 +1,3 @@ -package org.apache.lucene.demo.facet; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.demo.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.demo.facet; + import java.util.List; import java.util.Locale; diff --git a/lucene/demo/src/test/org/apache/lucene/demo/facet/TestMultiCategoryListsFacetsExample.java b/lucene/demo/src/test/org/apache/lucene/demo/facet/TestMultiCategoryListsFacetsExample.java index b7e6bc7f921..d53787f43a5 100644 --- a/lucene/demo/src/test/org/apache/lucene/demo/facet/TestMultiCategoryListsFacetsExample.java +++ b/lucene/demo/src/test/org/apache/lucene/demo/facet/TestMultiCategoryListsFacetsExample.java @@ -1,5 +1,3 @@ -package org.apache.lucene.demo.facet; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.demo.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.demo.facet; + import java.util.List; diff --git a/lucene/demo/src/test/org/apache/lucene/demo/facet/TestRangeFacetsExample.java b/lucene/demo/src/test/org/apache/lucene/demo/facet/TestRangeFacetsExample.java index f48d7065f80..94e6b0f0464 100644 --- a/lucene/demo/src/test/org/apache/lucene/demo/facet/TestRangeFacetsExample.java +++ b/lucene/demo/src/test/org/apache/lucene/demo/facet/TestRangeFacetsExample.java @@ -1,5 +1,3 @@ -package org.apache.lucene.demo.facet; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.demo.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.demo.facet; + import java.util.List; diff --git a/lucene/demo/src/test/org/apache/lucene/demo/facet/TestSimpleFacetsExample.java b/lucene/demo/src/test/org/apache/lucene/demo/facet/TestSimpleFacetsExample.java index 9b6087b57e5..54c73b10756 100644 --- a/lucene/demo/src/test/org/apache/lucene/demo/facet/TestSimpleFacetsExample.java +++ b/lucene/demo/src/test/org/apache/lucene/demo/facet/TestSimpleFacetsExample.java @@ -1,5 +1,3 @@ -package org.apache.lucene.demo.facet; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.demo.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.demo.facet; + import org.apache.lucene.facet.FacetResult; import org.apache.lucene.util.LuceneTestCase; diff --git a/lucene/demo/src/test/org/apache/lucene/demo/facet/TestSimpleSortedSetFacetsExample.java b/lucene/demo/src/test/org/apache/lucene/demo/facet/TestSimpleSortedSetFacetsExample.java index e4db6651a8a..240c7b395ff 100644 --- a/lucene/demo/src/test/org/apache/lucene/demo/facet/TestSimpleSortedSetFacetsExample.java +++ b/lucene/demo/src/test/org/apache/lucene/demo/facet/TestSimpleSortedSetFacetsExample.java @@ -1,5 +1,3 @@ -package org.apache.lucene.demo.facet; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.demo.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.demo.facet; + import java.util.List; diff --git a/lucene/expressions/src/java/org/apache/lucene/expressions/Bindings.java b/lucene/expressions/src/java/org/apache/lucene/expressions/Bindings.java index ac7529f3d5a..5ec2edb3931 100644 --- a/lucene/expressions/src/java/org/apache/lucene/expressions/Bindings.java +++ b/lucene/expressions/src/java/org/apache/lucene/expressions/Bindings.java @@ -1,4 +1,3 @@ -package org.apache.lucene.expressions; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.expressions; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.expressions; import org.apache.lucene.queries.function.ValueSource; diff --git a/lucene/expressions/src/java/org/apache/lucene/expressions/Expression.java b/lucene/expressions/src/java/org/apache/lucene/expressions/Expression.java index 0d8bd33ad76..02be23bd1b6 100644 --- a/lucene/expressions/src/java/org/apache/lucene/expressions/Expression.java +++ b/lucene/expressions/src/java/org/apache/lucene/expressions/Expression.java @@ -1,4 +1,3 @@ -package org.apache.lucene.expressions; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.expressions; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.expressions; import org.apache.lucene.expressions.js.JavascriptCompiler; // javadocs import org.apache.lucene.queries.function.FunctionValues; diff --git a/lucene/expressions/src/java/org/apache/lucene/expressions/ExpressionComparator.java b/lucene/expressions/src/java/org/apache/lucene/expressions/ExpressionComparator.java index bf386bcee61..eabf6dd3339 100644 --- a/lucene/expressions/src/java/org/apache/lucene/expressions/ExpressionComparator.java +++ b/lucene/expressions/src/java/org/apache/lucene/expressions/ExpressionComparator.java @@ -1,4 +1,3 @@ -package org.apache.lucene.expressions; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.expressions; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.expressions; import java.io.IOException; import java.util.HashMap; diff --git a/lucene/expressions/src/java/org/apache/lucene/expressions/ExpressionFunctionValues.java b/lucene/expressions/src/java/org/apache/lucene/expressions/ExpressionFunctionValues.java index 2452b21f082..ad195cdd75c 100644 --- a/lucene/expressions/src/java/org/apache/lucene/expressions/ExpressionFunctionValues.java +++ b/lucene/expressions/src/java/org/apache/lucene/expressions/ExpressionFunctionValues.java @@ -1,4 +1,3 @@ -package org.apache.lucene.expressions; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.expressions; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.expressions; import org.apache.lucene.queries.function.FunctionValues; import org.apache.lucene.queries.function.ValueSource; diff --git a/lucene/expressions/src/java/org/apache/lucene/expressions/ExpressionRescorer.java b/lucene/expressions/src/java/org/apache/lucene/expressions/ExpressionRescorer.java index 79812a0954a..33e84283ffc 100644 --- a/lucene/expressions/src/java/org/apache/lucene/expressions/ExpressionRescorer.java +++ b/lucene/expressions/src/java/org/apache/lucene/expressions/ExpressionRescorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.expressions; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.expressions; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.expressions; + import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/expressions/src/java/org/apache/lucene/expressions/ExpressionSortField.java b/lucene/expressions/src/java/org/apache/lucene/expressions/ExpressionSortField.java index 0a2df9fa06f..2b3983404b8 100644 --- a/lucene/expressions/src/java/org/apache/lucene/expressions/ExpressionSortField.java +++ b/lucene/expressions/src/java/org/apache/lucene/expressions/ExpressionSortField.java @@ -1,4 +1,3 @@ -package org.apache.lucene.expressions; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.expressions; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.expressions; import java.io.IOException; diff --git a/lucene/expressions/src/java/org/apache/lucene/expressions/ExpressionValueSource.java b/lucene/expressions/src/java/org/apache/lucene/expressions/ExpressionValueSource.java index 58397963763..fcba4550fd7 100644 --- a/lucene/expressions/src/java/org/apache/lucene/expressions/ExpressionValueSource.java +++ b/lucene/expressions/src/java/org/apache/lucene/expressions/ExpressionValueSource.java @@ -1,4 +1,3 @@ -package org.apache.lucene.expressions; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.expressions; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.expressions; import java.io.IOException; import java.util.Arrays; diff --git a/lucene/expressions/src/java/org/apache/lucene/expressions/FakeScorer.java b/lucene/expressions/src/java/org/apache/lucene/expressions/FakeScorer.java index d0997922773..c78951c468a 100644 --- a/lucene/expressions/src/java/org/apache/lucene/expressions/FakeScorer.java +++ b/lucene/expressions/src/java/org/apache/lucene/expressions/FakeScorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.expressions; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.expressions; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.expressions; + import java.io.IOException; diff --git a/lucene/expressions/src/java/org/apache/lucene/expressions/ScoreFunctionValues.java b/lucene/expressions/src/java/org/apache/lucene/expressions/ScoreFunctionValues.java index 059af177a10..e310c06378e 100644 --- a/lucene/expressions/src/java/org/apache/lucene/expressions/ScoreFunctionValues.java +++ b/lucene/expressions/src/java/org/apache/lucene/expressions/ScoreFunctionValues.java @@ -1,4 +1,3 @@ -package org.apache.lucene.expressions; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.expressions; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.expressions; import java.io.IOException; diff --git a/lucene/expressions/src/java/org/apache/lucene/expressions/ScoreValueSource.java b/lucene/expressions/src/java/org/apache/lucene/expressions/ScoreValueSource.java index c6ffb2a0c42..ea1669cdf79 100644 --- a/lucene/expressions/src/java/org/apache/lucene/expressions/ScoreValueSource.java +++ b/lucene/expressions/src/java/org/apache/lucene/expressions/ScoreValueSource.java @@ -1,5 +1,3 @@ -package org.apache.lucene.expressions; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.expressions; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.expressions; + import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.queries.function.FunctionValues; diff --git a/lucene/expressions/src/java/org/apache/lucene/expressions/SimpleBindings.java b/lucene/expressions/src/java/org/apache/lucene/expressions/SimpleBindings.java index 07e55876b50..e64249e504f 100644 --- a/lucene/expressions/src/java/org/apache/lucene/expressions/SimpleBindings.java +++ b/lucene/expressions/src/java/org/apache/lucene/expressions/SimpleBindings.java @@ -1,5 +1,3 @@ -package org.apache.lucene.expressions; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.expressions; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.expressions; + import java.util.HashMap; import java.util.Map; diff --git a/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptCompiler.java b/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptCompiler.java index 83734f87406..c78f6a97312 100644 --- a/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptCompiler.java +++ b/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptCompiler.java @@ -1,4 +1,3 @@ -package org.apache.lucene.expressions.js; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.expressions.js; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.expressions.js; import java.io.IOException; import java.io.Reader; diff --git a/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptErrorHandlingLexer.java b/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptErrorHandlingLexer.java index bb0fa0d977f..7e9f2435141 100644 --- a/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptErrorHandlingLexer.java +++ b/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptErrorHandlingLexer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.expressions.js; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.expressions.js; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.expressions.js; + import java.text.ParseException; diff --git a/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptParserErrorStrategy.java b/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptParserErrorStrategy.java index 2b1392db020..63ff6fc8d92 100644 --- a/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptParserErrorStrategy.java +++ b/lucene/expressions/src/java/org/apache/lucene/expressions/js/JavascriptParserErrorStrategy.java @@ -1,5 +1,3 @@ -package org.apache.lucene.expressions.js; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.expressions.js; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.expressions.js; + import java.text.ParseException; diff --git a/lucene/expressions/src/java/org/apache/lucene/expressions/js/VariableContext.java b/lucene/expressions/src/java/org/apache/lucene/expressions/js/VariableContext.java index e0d3255ea4d..a9b8c929b13 100644 --- a/lucene/expressions/src/java/org/apache/lucene/expressions/js/VariableContext.java +++ b/lucene/expressions/src/java/org/apache/lucene/expressions/js/VariableContext.java @@ -1,5 +1,3 @@ -package org.apache.lucene.expressions.js; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.expressions.js; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.expressions.js; + import java.util.ArrayList; import java.util.List; diff --git a/lucene/expressions/src/java/org/apache/lucene/expressions/js/package-info.java b/lucene/expressions/src/java/org/apache/lucene/expressions/js/package-info.java index 3aa543a6f60..b58994ffc2d 100644 --- a/lucene/expressions/src/java/org/apache/lucene/expressions/js/package-info.java +++ b/lucene/expressions/src/java/org/apache/lucene/expressions/js/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Javascript expressions. *

A Javascript expression is a numeric expression specified using an expression syntax that's based on JavaScript expressions. You can construct expressions using:

diff --git a/lucene/expressions/src/java/org/apache/lucene/expressions/package-info.java b/lucene/expressions/src/java/org/apache/lucene/expressions/package-info.java index 62a519b4c20..77c8b9945da 100644 --- a/lucene/expressions/src/java/org/apache/lucene/expressions/package-info.java +++ b/lucene/expressions/src/java/org/apache/lucene/expressions/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Expressions. *

diff --git a/lucene/expressions/src/test/org/apache/lucene/expressions/TestDemoExpressions.java b/lucene/expressions/src/test/org/apache/lucene/expressions/TestDemoExpressions.java index 039f1a7bacb..4699b85f167 100644 --- a/lucene/expressions/src/test/org/apache/lucene/expressions/TestDemoExpressions.java +++ b/lucene/expressions/src/test/org/apache/lucene/expressions/TestDemoExpressions.java @@ -1,3 +1,19 @@ +/* + * 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.expressions; import org.apache.lucene.document.Document; @@ -27,22 +43,6 @@ import static org.apache.lucene.expressions.js.VariableContext.Type.MEMBER; import static org.apache.lucene.expressions.js.VariableContext.Type.STR_INDEX; import static org.apache.lucene.expressions.js.VariableContext.Type.INT_INDEX; -/* - * 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. - */ /** simple demo of using expressions */ public class TestDemoExpressions extends LuceneTestCase { diff --git a/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionRescorer.java b/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionRescorer.java index cb4656be8f4..f60d45b7d94 100644 --- a/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionRescorer.java +++ b/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionRescorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.expressions; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.expressions; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.expressions; + import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; diff --git a/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSortField.java b/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSortField.java index 48fcda45b6d..ec6ea11edc7 100644 --- a/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSortField.java +++ b/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSortField.java @@ -1,5 +1,3 @@ -package org.apache.lucene.expressions; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.expressions; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.expressions; + import org.apache.lucene.expressions.js.JavascriptCompiler; import org.apache.lucene.search.SortField; diff --git a/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSorts.java b/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSorts.java index e244d1d3a75..cb24f6fe2a5 100644 --- a/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSorts.java +++ b/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSorts.java @@ -1,5 +1,3 @@ -package org.apache.lucene.expressions; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.expressions; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.expressions; + import java.util.Arrays; import java.util.Collections; diff --git a/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionValidation.java b/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionValidation.java index be2a9cbf567..9aa9a39f346 100644 --- a/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionValidation.java +++ b/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionValidation.java @@ -1,5 +1,3 @@ -package org.apache.lucene.expressions; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.expressions; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.expressions; + import org.apache.lucene.expressions.js.JavascriptCompiler; import org.apache.lucene.search.SortField; diff --git a/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionValueSource.java b/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionValueSource.java index 4513d060fca..6bf73d1d67c 100644 --- a/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionValueSource.java +++ b/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionValueSource.java @@ -1,5 +1,3 @@ -package org.apache.lucene.expressions; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.expressions; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.expressions; + import java.util.HashMap; diff --git a/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestCustomFunctions.java b/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestCustomFunctions.java index 5c7dfec2662..ca807e28b9a 100644 --- a/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestCustomFunctions.java +++ b/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestCustomFunctions.java @@ -1,5 +1,3 @@ -package org.apache.lucene.expressions.js; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.expressions.js; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.expressions.js; + import java.io.PrintWriter; import java.io.StringWriter; diff --git a/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestJavascriptCompiler.java b/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestJavascriptCompiler.java index c572c332a25..8a9532173eb 100644 --- a/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestJavascriptCompiler.java +++ b/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestJavascriptCompiler.java @@ -1,4 +1,3 @@ -package org.apache.lucene.expressions.js; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.expressions.js; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.expressions.js; import java.text.ParseException; diff --git a/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestJavascriptFunction.java b/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestJavascriptFunction.java index d180476cb45..207b9936db9 100644 --- a/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestJavascriptFunction.java +++ b/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestJavascriptFunction.java @@ -1,4 +1,3 @@ -package org.apache.lucene.expressions.js; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.expressions.js; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.expressions.js; import org.apache.lucene.expressions.Expression; import org.apache.lucene.util.LuceneTestCase; diff --git a/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestJavascriptOperations.java b/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestJavascriptOperations.java index f0cd482d308..82d50564416 100644 --- a/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestJavascriptOperations.java +++ b/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestJavascriptOperations.java @@ -1,4 +1,3 @@ -package org.apache.lucene.expressions.js; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.expressions.js; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.expressions.js; import org.apache.lucene.expressions.Expression; import org.apache.lucene.util.LuceneTestCase; diff --git a/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestVariableContext.java b/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestVariableContext.java index f8392edfb57..c3cc351fcf8 100644 --- a/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestVariableContext.java +++ b/lucene/expressions/src/test/org/apache/lucene/expressions/js/TestVariableContext.java @@ -1,5 +1,3 @@ -package org.apache.lucene.expressions.js; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.expressions.js; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.expressions.js; + import org.apache.lucene.util.LuceneTestCase; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/DrillDownQuery.java b/lucene/facet/src/java/org/apache/lucene/facet/DrillDownQuery.java index 7967aaecfa5..91d5b0f80ff 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/DrillDownQuery.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/DrillDownQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet; - /* * 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.lucene.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/DrillSideways.java b/lucene/facet/src/java/org/apache/lucene/facet/DrillSideways.java index e633579d7fe..cc5647ef03e 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/DrillSideways.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/DrillSideways.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet; - /* * 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.lucene.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet; import java.io.IOException; import java.util.HashMap; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/DrillSidewaysQuery.java b/lucene/facet/src/java/org/apache/lucene/facet/DrillSidewaysQuery.java index 01031636a8c..b3ffb0d39a5 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/DrillSidewaysQuery.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/DrillSidewaysQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet; + import java.io.IOException; import java.util.Arrays; import java.util.Comparator; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/DrillSidewaysScorer.java b/lucene/facet/src/java/org/apache/lucene/facet/DrillSidewaysScorer.java index d825b2a6029..42da30a24f7 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/DrillSidewaysScorer.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/DrillSidewaysScorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet; - /* * 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.lucene.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet; import java.io.IOException; import java.util.Collection; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/FacetField.java b/lucene/facet/src/java/org/apache/lucene/facet/FacetField.java index 2b2a39e0c6c..14dabf1e8db 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/FacetField.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/FacetField.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet; - /* * 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.lucene.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet; import java.util.Arrays; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/FacetResult.java b/lucene/facet/src/java/org/apache/lucene/facet/FacetResult.java index b90622dc138..7635364337a 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/FacetResult.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/FacetResult.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet; - /* * 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.lucene.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet; import java.util.Arrays; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/Facets.java b/lucene/facet/src/java/org/apache/lucene/facet/Facets.java index 4842603430e..e9c4707a993 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/Facets.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/Facets.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet; - /* * 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.lucene.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet; import java.io.IOException; import java.util.List; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/FacetsCollector.java b/lucene/facet/src/java/org/apache/lucene/facet/FacetsCollector.java index 99300df907c..d3f2eb871b4 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/FacetsCollector.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/FacetsCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet; - /* * 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.lucene.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/FacetsConfig.java b/lucene/facet/src/java/org/apache/lucene/facet/FacetsConfig.java index 4b155feaa24..96db60f4e42 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/FacetsConfig.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/FacetsConfig.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet; - /* * 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.lucene.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet; import java.io.IOException; import java.util.ArrayList; @@ -30,7 +29,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.apache.lucene.document.BinaryDocValuesField; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; -import org.apache.lucene.document.FieldType; import org.apache.lucene.document.SortedSetDocValuesField; import org.apache.lucene.document.StringField; import org.apache.lucene.facet.sortedset.SortedSetDocValuesFacetField; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/LabelAndValue.java b/lucene/facet/src/java/org/apache/lucene/facet/LabelAndValue.java index 018d6a6e9fb..9e460ebb9a3 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/LabelAndValue.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/LabelAndValue.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet; - /* * 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.lucene.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet; /** Single label and its value, usually contained in a * {@link FacetResult}. */ diff --git a/lucene/facet/src/java/org/apache/lucene/facet/MultiFacets.java b/lucene/facet/src/java/org/apache/lucene/facet/MultiFacets.java index e5a764c0af1..a890816dff5 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/MultiFacets.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/MultiFacets.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet; - /* * 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.lucene.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/RandomSamplingFacetsCollector.java b/lucene/facet/src/java/org/apache/lucene/facet/RandomSamplingFacetsCollector.java index dcc366a43c3..74590dabe80 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/RandomSamplingFacetsCollector.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/RandomSamplingFacetsCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet; - /* * 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.lucene.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/TopOrdAndFloatQueue.java b/lucene/facet/src/java/org/apache/lucene/facet/TopOrdAndFloatQueue.java index e6972d48441..d0fe8a9cd87 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/TopOrdAndFloatQueue.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/TopOrdAndFloatQueue.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet; - /* * 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.lucene.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet; import org.apache.lucene.util.PriorityQueue; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/TopOrdAndIntQueue.java b/lucene/facet/src/java/org/apache/lucene/facet/TopOrdAndIntQueue.java index b60544149fa..4429116f392 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/TopOrdAndIntQueue.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/TopOrdAndIntQueue.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet; - /* * 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.lucene.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet; import org.apache.lucene.util.PriorityQueue; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/range/DoubleRange.java b/lucene/facet/src/java/org/apache/lucene/facet/range/DoubleRange.java index 415efe43f5a..362dd7b7e97 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/range/DoubleRange.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/range/DoubleRange.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet.range; - /* * 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.lucene.facet.range; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.range; import java.io.IOException; import java.util.Collections; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/range/DoubleRangeFacetCounts.java b/lucene/facet/src/java/org/apache/lucene/facet/range/DoubleRangeFacetCounts.java index 485a8d6b9d7..8892725bb83 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/range/DoubleRangeFacetCounts.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/range/DoubleRangeFacetCounts.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet.range; - /* * 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.lucene.facet.range; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.range; import java.io.IOException; import java.util.Collections; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/range/LongRange.java b/lucene/facet/src/java/org/apache/lucene/facet/range/LongRange.java index d6745de2d37..73c519d124e 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/range/LongRange.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/range/LongRange.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet.range; - /* * 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.lucene.facet.range; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.range; import java.io.IOException; import java.util.Collections; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/range/LongRangeCounter.java b/lucene/facet/src/java/org/apache/lucene/facet/range/LongRangeCounter.java index 0f047b2d9a1..8c0b123007d 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/range/LongRangeCounter.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/range/LongRangeCounter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet.range; - /* * 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.lucene.facet.range; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.range; import java.util.ArrayList; import java.util.Collections; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/range/LongRangeFacetCounts.java b/lucene/facet/src/java/org/apache/lucene/facet/range/LongRangeFacetCounts.java index d7295767d20..0512ab3076f 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/range/LongRangeFacetCounts.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/range/LongRangeFacetCounts.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet.range; - /* * 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.lucene.facet.range; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.range; import java.io.IOException; import java.util.Collections; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/range/Range.java b/lucene/facet/src/java/org/apache/lucene/facet/range/Range.java index 3abfdde60db..227383165fb 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/range/Range.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/range/Range.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet.range; - /* * 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.lucene.facet.range; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.range; import org.apache.lucene.facet.DrillDownQuery; // javadocs import org.apache.lucene.queries.function.ValueSource; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/range/RangeFacetCounts.java b/lucene/facet/src/java/org/apache/lucene/facet/range/RangeFacetCounts.java index 1b91d2aab51..61ec53f4873 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/range/RangeFacetCounts.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/range/RangeFacetCounts.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet.range; - /* * 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.lucene.facet.range; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.range; import java.io.IOException; import java.util.Collections; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/range/package-info.java b/lucene/facet/src/java/org/apache/lucene/facet/range/package-info.java index aa41077fc3e..8e5d8125116 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/range/package-info.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/range/package-info.java @@ -14,8 +14,4 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -/** - * Provides range faceting capabilities. - */ package org.apache.lucene.facet.range; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/sortedset/DefaultSortedSetDocValuesReaderState.java b/lucene/facet/src/java/org/apache/lucene/facet/sortedset/DefaultSortedSetDocValuesReaderState.java index 7ff40c7c9b0..5d374f782c7 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/sortedset/DefaultSortedSetDocValuesReaderState.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/sortedset/DefaultSortedSetDocValuesReaderState.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet.sortedset; - /* * 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.lucene.facet.sortedset; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.sortedset; import java.io.IOException; import java.util.Arrays; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/sortedset/SortedSetDocValuesFacetCounts.java b/lucene/facet/src/java/org/apache/lucene/facet/sortedset/SortedSetDocValuesFacetCounts.java index a54932f520c..a571328cada 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/sortedset/SortedSetDocValuesFacetCounts.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/sortedset/SortedSetDocValuesFacetCounts.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet.sortedset; - /* * 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.lucene.facet.sortedset; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.sortedset; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/sortedset/SortedSetDocValuesFacetField.java b/lucene/facet/src/java/org/apache/lucene/facet/sortedset/SortedSetDocValuesFacetField.java index d24491dce45..9b6c26eb074 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/sortedset/SortedSetDocValuesFacetField.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/sortedset/SortedSetDocValuesFacetField.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet.sortedset; - /* * 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.lucene.facet.sortedset; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.sortedset; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/sortedset/SortedSetDocValuesReaderState.java b/lucene/facet/src/java/org/apache/lucene/facet/sortedset/SortedSetDocValuesReaderState.java index 177173a42c0..83ed3f04f25 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/sortedset/SortedSetDocValuesReaderState.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/sortedset/SortedSetDocValuesReaderState.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet.sortedset; - /* * 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.lucene.facet.sortedset; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.sortedset; import java.io.IOException; import java.util.Map; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/AssociationFacetField.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/AssociationFacetField.java index 216595ed542..c2696a4caf1 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/AssociationFacetField.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/AssociationFacetField.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet.taxonomy; - /* * 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.lucene.facet.taxonomy; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy; import java.util.Arrays; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/CachedOrdinalsReader.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/CachedOrdinalsReader.java index d80e8d33858..0fbf4fb8c69 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/CachedOrdinalsReader.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/CachedOrdinalsReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet.taxonomy; - /* * 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.lucene.facet.taxonomy; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy; import java.io.IOException; import java.util.Collection; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/DocValuesOrdinalsReader.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/DocValuesOrdinalsReader.java index 941b575af5e..6afe5c70783 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/DocValuesOrdinalsReader.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/DocValuesOrdinalsReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet.taxonomy; - /* * 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.lucene.facet.taxonomy; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy; import java.io.IOException; @@ -28,7 +27,6 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IntsRef; /** Decodes ordinals previously indexed into a BinaryDocValues field */ - public class DocValuesOrdinalsReader extends OrdinalsReader { private final String field; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/FacetLabel.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/FacetLabel.java index ee14e7f6152..2778d9e17ac 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/FacetLabel.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/FacetLabel.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet.taxonomy; - /* * 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.lucene.facet.taxonomy; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy; import static org.apache.lucene.util.ByteBlockPool.BYTE_BLOCK_SIZE; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/FakeScorer.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/FakeScorer.java index 0a8f0ed3a05..238b74c9b52 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/FakeScorer.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/FakeScorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet.taxonomy; - /* * 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.lucene.facet.taxonomy; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy; import java.io.IOException; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/FastTaxonomyFacetCounts.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/FastTaxonomyFacetCounts.java index 7f4afcea4e3..0ed8f22ead5 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/FastTaxonomyFacetCounts.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/FastTaxonomyFacetCounts.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet.taxonomy; - /* * 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.lucene.facet.taxonomy; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy; import java.io.IOException; import java.util.List; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/FloatAssociationFacetField.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/FloatAssociationFacetField.java index d89b49e1ffb..a3bc8c456fe 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/FloatAssociationFacetField.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/FloatAssociationFacetField.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet.taxonomy; - /* * 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.lucene.facet.taxonomy; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy; import java.util.Arrays; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/FloatTaxonomyFacets.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/FloatTaxonomyFacets.java index d82db6e0788..2e8231d8d6c 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/FloatTaxonomyFacets.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/FloatTaxonomyFacets.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet.taxonomy; - /* * 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.lucene.facet.taxonomy; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy; import java.io.IOException; import java.util.Map; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/IntAssociationFacetField.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/IntAssociationFacetField.java index e2f953fd8c1..19ea0d7c3f1 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/IntAssociationFacetField.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/IntAssociationFacetField.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet.taxonomy; - /* * 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.lucene.facet.taxonomy; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy; import java.util.Arrays; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/IntTaxonomyFacets.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/IntTaxonomyFacets.java index bfc5ed5b686..1b0a96d4a20 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/IntTaxonomyFacets.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/IntTaxonomyFacets.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet.taxonomy; - /* * 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.lucene.facet.taxonomy; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy; import java.io.IOException; import java.util.Map; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/LRUHashMap.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/LRUHashMap.java index 7b052987733..238f919d018 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/LRUHashMap.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/LRUHashMap.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet.taxonomy; - /* * 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.lucene.facet.taxonomy; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy; import java.util.LinkedHashMap; import java.util.Map; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/OrdinalMappingLeafReader.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/OrdinalMappingLeafReader.java index a0fef04ee1f..f116cd95c81 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/OrdinalMappingLeafReader.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/OrdinalMappingLeafReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet.taxonomy; - /* * 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.lucene.facet.taxonomy; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy; import java.io.IOException; import java.util.HashSet; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/OrdinalsReader.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/OrdinalsReader.java index 985059efac6..fdee3658eed 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/OrdinalsReader.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/OrdinalsReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet.taxonomy; - /* * 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.lucene.facet.taxonomy; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy; import java.io.IOException; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/ParallelTaxonomyArrays.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/ParallelTaxonomyArrays.java index fbfd9123bb0..a9c27da6fa7 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/ParallelTaxonomyArrays.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/ParallelTaxonomyArrays.java @@ -1,6 +1,3 @@ -package org.apache.lucene.facet.taxonomy; - - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +14,7 @@ package org.apache.lucene.facet.taxonomy; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy; /** * Returns 3 arrays for traversing the taxonomy: diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/PrintTaxonomyStats.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/PrintTaxonomyStats.java index 668a300636f..10654628ff7 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/PrintTaxonomyStats.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/PrintTaxonomyStats.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet.taxonomy; - /* * 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.lucene.facet.taxonomy; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy; import java.io.IOException; import java.io.PrintStream; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/SearcherTaxonomyManager.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/SearcherTaxonomyManager.java index cdd0a15cbc6..92ef58ea7f1 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/SearcherTaxonomyManager.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/SearcherTaxonomyManager.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet.taxonomy; - /* * 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.lucene.facet.taxonomy; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy; import java.io.IOException; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/TaxonomyFacetCounts.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/TaxonomyFacetCounts.java index cbb74913b95..7dd31d3fd4d 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/TaxonomyFacetCounts.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/TaxonomyFacetCounts.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet.taxonomy; - /* * 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.lucene.facet.taxonomy; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy; import java.io.IOException; import java.util.List; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/TaxonomyFacetSumFloatAssociations.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/TaxonomyFacetSumFloatAssociations.java index cded8c28396..a76e750f4b4 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/TaxonomyFacetSumFloatAssociations.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/TaxonomyFacetSumFloatAssociations.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet.taxonomy; - /* * 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.lucene.facet.taxonomy; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy; import java.io.IOException; import java.util.List; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/TaxonomyFacetSumIntAssociations.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/TaxonomyFacetSumIntAssociations.java index 2b5d3e365bd..64001ad2113 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/TaxonomyFacetSumIntAssociations.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/TaxonomyFacetSumIntAssociations.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet.taxonomy; - /* * 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.lucene.facet.taxonomy; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy; import java.io.IOException; import java.util.List; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/TaxonomyFacetSumValueSource.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/TaxonomyFacetSumValueSource.java index bef02b48f9c..4010c819769 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/TaxonomyFacetSumValueSource.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/TaxonomyFacetSumValueSource.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet.taxonomy; - /* * 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.lucene.facet.taxonomy; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy; import java.io.IOException; import java.util.HashMap; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/TaxonomyFacets.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/TaxonomyFacets.java index d1d9e11e059..d111b442bb6 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/TaxonomyFacets.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/TaxonomyFacets.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet.taxonomy; - /* * 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.lucene.facet.taxonomy; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/TaxonomyMergeUtils.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/TaxonomyMergeUtils.java index 7be729420c1..8d8f01bb0c9 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/TaxonomyMergeUtils.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/TaxonomyMergeUtils.java @@ -1,20 +1,3 @@ -package org.apache.lucene.facet.taxonomy; - -import java.io.IOException; -import java.util.List; - -import org.apache.lucene.facet.FacetsConfig; -import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter; -import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter.OrdinalMap; -import org.apache.lucene.index.LeafReader; -import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.DirectoryReader; -import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.index.CodecReader; -import org.apache.lucene.index.MultiReader; -import org.apache.lucene.index.SlowCodecReaderWrapper; -import org.apache.lucene.store.Directory; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -31,6 +14,20 @@ import org.apache.lucene.store.Directory; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy; + +import java.io.IOException; +import java.util.List; + +import org.apache.lucene.facet.FacetsConfig; +import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter; +import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter.OrdinalMap; +import org.apache.lucene.index.LeafReaderContext; +import org.apache.lucene.index.DirectoryReader; +import org.apache.lucene.index.IndexWriter; +import org.apache.lucene.index.CodecReader; +import org.apache.lucene.index.SlowCodecReaderWrapper; +import org.apache.lucene.store.Directory; /** * Utility methods for merging index and taxonomy directories. diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/TaxonomyReader.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/TaxonomyReader.java index a7b224002af..319377a2013 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/TaxonomyReader.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/TaxonomyReader.java @@ -1,12 +1,3 @@ -package org.apache.lucene.facet.taxonomy; - -import java.io.Closeable; -import java.io.IOException; -import java.util.Map; -import java.util.concurrent.atomic.AtomicInteger; - -import org.apache.lucene.store.AlreadyClosedException; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -23,6 +14,14 @@ import org.apache.lucene.store.AlreadyClosedException; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy; + +import java.io.Closeable; +import java.io.IOException; +import java.util.Map; +import java.util.concurrent.atomic.AtomicInteger; + +import org.apache.lucene.store.AlreadyClosedException; /** * TaxonomyReader is the read-only interface with which the faceted-search diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/TaxonomyWriter.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/TaxonomyWriter.java index d00d1d02896..763fe973742 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/TaxonomyWriter.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/TaxonomyWriter.java @@ -1,11 +1,3 @@ -package org.apache.lucene.facet.taxonomy; - -import java.io.Closeable; -import java.io.IOException; -import java.util.Map; - -import org.apache.lucene.index.TwoPhaseCommit; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -22,6 +14,13 @@ import org.apache.lucene.index.TwoPhaseCommit; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy; + +import java.io.Closeable; +import java.io.IOException; +import java.util.Map; + +import org.apache.lucene.index.TwoPhaseCommit; /** * TaxonomyWriter is the interface which the faceted-search library uses diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/Consts.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/Consts.java index 2f103e86dc6..faf41e2c000 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/Consts.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/Consts.java @@ -1,7 +1,3 @@ -package org.apache.lucene.facet.taxonomy.directory; - -import org.apache.lucene.util.BytesRef; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import org.apache.lucene.util.BytesRef; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy.directory; + +import org.apache.lucene.util.BytesRef; /** * @lucene.experimental diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyReader.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyReader.java index 2418a199801..dee967e7b9a 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyReader.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyReader.java @@ -1,3 +1,19 @@ +/* + * 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.facet.taxonomy.directory; import java.io.IOException; @@ -21,23 +37,6 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.IOUtils; -/* - * 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 {@link TaxonomyReader} which retrieves stored taxonomy information from a * {@link Directory}. diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java index e24100729c1..4c6101fe197 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyWriter.java @@ -1,3 +1,19 @@ +/* + * 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.facet.taxonomy.directory; import java.io.BufferedInputStream; @@ -46,23 +62,6 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.store.LockObtainFailedException; import org.apache.lucene.util.BytesRef; -/* - * 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. - */ - /** * {@link TaxonomyWriter} which uses a {@link Directory} to store the taxonomy * information on disk, and keeps an additional in-memory cache of some or all diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/TaxonomyIndexArrays.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/TaxonomyIndexArrays.java index c7981859ced..bdd5c805e4f 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/TaxonomyIndexArrays.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/TaxonomyIndexArrays.java @@ -1,16 +1,3 @@ -package org.apache.lucene.facet.taxonomy.directory; - -import org.apache.lucene.facet.taxonomy.ParallelTaxonomyArrays; -import org.apache.lucene.facet.taxonomy.TaxonomyReader; -import org.apache.lucene.index.CorruptIndexException; -import org.apache.lucene.index.PostingsEnum; -import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.MultiFields; -import org.apache.lucene.search.DocIdSetIterator; -import org.apache.lucene.util.ArrayUtil; - -import java.io.IOException; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -27,6 +14,18 @@ import java.io.IOException; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy.directory; + +import org.apache.lucene.facet.taxonomy.ParallelTaxonomyArrays; +import org.apache.lucene.facet.taxonomy.TaxonomyReader; +import org.apache.lucene.index.CorruptIndexException; +import org.apache.lucene.index.PostingsEnum; +import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.MultiFields; +import org.apache.lucene.search.DocIdSetIterator; +import org.apache.lucene.util.ArrayUtil; + +import java.io.IOException; /** * A {@link ParallelTaxonomyArrays} that are initialized from the taxonomy diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/CategoryPathUtils.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/CategoryPathUtils.java index 1ea5e97808e..497440e9f74 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/CategoryPathUtils.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/CategoryPathUtils.java @@ -1,7 +1,3 @@ -package org.apache.lucene.facet.taxonomy.writercache; - -import org.apache.lucene.facet.taxonomy.FacetLabel; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import org.apache.lucene.facet.taxonomy.FacetLabel; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy.writercache; + +import org.apache.lucene.facet.taxonomy.FacetLabel; /** Utilities for use of {@link FacetLabel} by {@link CompactLabelToOrdinal}. */ class CategoryPathUtils { diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/CharBlockArray.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/CharBlockArray.java index d182f8b6f1c..017641a8953 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/CharBlockArray.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/CharBlockArray.java @@ -1,14 +1,3 @@ -package org.apache.lucene.facet.taxonomy.writercache; - -import java.io.IOException; -import java.io.InputStream; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.io.OutputStream; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -25,6 +14,16 @@ import java.util.List; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy.writercache; + +import java.io.IOException; +import java.io.InputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.OutputStream; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; /** * Similar to {@link StringBuilder}, but with a more efficient growing strategy. diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/Cl2oTaxonomyWriterCache.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/Cl2oTaxonomyWriterCache.java index 9d678f05190..03b0a3c84d9 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/Cl2oTaxonomyWriterCache.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/Cl2oTaxonomyWriterCache.java @@ -1,11 +1,3 @@ -package org.apache.lucene.facet.taxonomy.writercache; - -import java.util.concurrent.locks.ReadWriteLock; -import java.util.concurrent.locks.ReentrantReadWriteLock; - -import org.apache.lucene.facet.taxonomy.FacetLabel; -import org.apache.lucene.facet.taxonomy.writercache.TaxonomyWriterCache; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -22,6 +14,13 @@ import org.apache.lucene.facet.taxonomy.writercache.TaxonomyWriterCache; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy.writercache; + +import java.util.concurrent.locks.ReadWriteLock; +import java.util.concurrent.locks.ReentrantReadWriteLock; + +import org.apache.lucene.facet.taxonomy.FacetLabel; +import org.apache.lucene.facet.taxonomy.writercache.TaxonomyWriterCache; /** * {@link TaxonomyWriterCache} using {@link CompactLabelToOrdinal}. Although diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/CollisionMap.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/CollisionMap.java index 28cc8eeaa3a..205a540f35a 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/CollisionMap.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/CollisionMap.java @@ -1,10 +1,3 @@ -package org.apache.lucene.facet.taxonomy.writercache; - -import java.util.Iterator; -import java.util.NoSuchElementException; - -import org.apache.lucene.facet.taxonomy.FacetLabel; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -21,6 +14,12 @@ import org.apache.lucene.facet.taxonomy.FacetLabel; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy.writercache; + +import java.util.Iterator; +import java.util.NoSuchElementException; + +import org.apache.lucene.facet.taxonomy.FacetLabel; /** * HashMap to store colliding labels. See {@link CompactLabelToOrdinal} for diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/CompactLabelToOrdinal.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/CompactLabelToOrdinal.java index 68922a4045d..4e6173e236e 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/CompactLabelToOrdinal.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/CompactLabelToOrdinal.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet.taxonomy.writercache; - /* * 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.lucene.facet.taxonomy.writercache; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy.writercache; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/LabelToOrdinal.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/LabelToOrdinal.java index 6332621a6b5..40884f602f6 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/LabelToOrdinal.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/LabelToOrdinal.java @@ -1,7 +1,3 @@ -package org.apache.lucene.facet.taxonomy.writercache; - -import org.apache.lucene.facet.taxonomy.FacetLabel; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import org.apache.lucene.facet.taxonomy.FacetLabel; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy.writercache; + +import org.apache.lucene.facet.taxonomy.FacetLabel; /** * Abstract class for storing Label->Ordinal mappings in a taxonomy. diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/LruTaxonomyWriterCache.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/LruTaxonomyWriterCache.java index 1393a0d2264..828e2b6df3a 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/LruTaxonomyWriterCache.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/LruTaxonomyWriterCache.java @@ -1,8 +1,3 @@ - package org.apache.lucene.facet.taxonomy.writercache; - -import org.apache.lucene.facet.taxonomy.FacetLabel; -import org.apache.lucene.facet.taxonomy.writercache.TaxonomyWriterCache; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -19,6 +14,10 @@ import org.apache.lucene.facet.taxonomy.writercache.TaxonomyWriterCache; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy.writercache; + +import org.apache.lucene.facet.taxonomy.FacetLabel; +import org.apache.lucene.facet.taxonomy.writercache.TaxonomyWriterCache; /** * LRU {@link TaxonomyWriterCache} - good choice for huge taxonomies. diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/NameHashIntCacheLRU.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/NameHashIntCacheLRU.java index 9743d4b2153..450d9d99252 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/NameHashIntCacheLRU.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/NameHashIntCacheLRU.java @@ -1,7 +1,3 @@ -package org.apache.lucene.facet.taxonomy.writercache; - -import org.apache.lucene.facet.taxonomy.FacetLabel; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import org.apache.lucene.facet.taxonomy.FacetLabel; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy.writercache; + +import org.apache.lucene.facet.taxonomy.FacetLabel; /** * An an LRU cache of mapping from name to int. diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/NameIntCacheLRU.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/NameIntCacheLRU.java index b42549650b8..778f0b7e2ed 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/NameIntCacheLRU.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/NameIntCacheLRU.java @@ -1,10 +1,3 @@ -package org.apache.lucene.facet.taxonomy.writercache; - -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedHashMap; -import org.apache.lucene.facet.taxonomy.FacetLabel; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -21,6 +14,12 @@ import org.apache.lucene.facet.taxonomy.FacetLabel; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy.writercache; + +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedHashMap; +import org.apache.lucene.facet.taxonomy.FacetLabel; /** * An an LRU cache of mapping from name to int. diff --git a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/TaxonomyWriterCache.java b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/TaxonomyWriterCache.java index d5e5b407347..f31042648a8 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/TaxonomyWriterCache.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/TaxonomyWriterCache.java @@ -1,8 +1,3 @@ -package org.apache.lucene.facet.taxonomy.writercache; - -import org.apache.lucene.facet.taxonomy.FacetLabel; -import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -19,6 +14,10 @@ import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy.writercache; + +import org.apache.lucene.facet.taxonomy.FacetLabel; +import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter; /** * TaxonomyWriterCache is a relatively simple interface for a cache of diff --git a/lucene/facet/src/test/org/apache/lucene/facet/AssertingSubDocsAtOnceCollector.java b/lucene/facet/src/test/org/apache/lucene/facet/AssertingSubDocsAtOnceCollector.java index 61c1277ce99..793cc412db9 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/AssertingSubDocsAtOnceCollector.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/AssertingSubDocsAtOnceCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet; - /* * 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.lucene.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet; import java.util.ArrayList; import java.util.List; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/FacetTestCase.java b/lucene/facet/src/test/org/apache/lucene/facet/FacetTestCase.java index 1622e3d2f08..a88a080a926 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/FacetTestCase.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/FacetTestCase.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet; - /* * 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.lucene.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/SlowRAMDirectory.java b/lucene/facet/src/test/org/apache/lucene/facet/SlowRAMDirectory.java index f4a6464cc68..f6e691e8724 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/SlowRAMDirectory.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/SlowRAMDirectory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet; - /* * 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.lucene.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet; import java.io.IOException; import java.util.Random; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/TestDrillDownQuery.java b/lucene/facet/src/test/org/apache/lucene/facet/TestDrillDownQuery.java index 1ac4ea88acf..f76e839a04b 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/TestDrillDownQuery.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/TestDrillDownQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet; - /* * 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.lucene.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet; import java.io.IOException; import java.util.Random; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/TestDrillSideways.java b/lucene/facet/src/test/org/apache/lucene/facet/TestDrillSideways.java index 7027269e6ea..e37215ec3d3 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/TestDrillSideways.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/TestDrillSideways.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet; - /* * 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.lucene.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/TestFacetsConfig.java b/lucene/facet/src/test/org/apache/lucene/facet/TestFacetsConfig.java index 3c217b44d03..630aadf466d 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/TestFacetsConfig.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/TestFacetsConfig.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet; - /* * 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.lucene.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet; import java.util.Arrays; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/TestMultipleIndexFields.java b/lucene/facet/src/test/org/apache/lucene/facet/TestMultipleIndexFields.java index 97528cdb37e..ea29c68d888 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/TestMultipleIndexFields.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/TestMultipleIndexFields.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet; - /* * 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.lucene.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet; import java.io.IOException; import java.util.HashMap; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/TestRandomSamplingFacetsCollector.java b/lucene/facet/src/test/org/apache/lucene/facet/TestRandomSamplingFacetsCollector.java index cf9d316782a..a275c27bc25 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/TestRandomSamplingFacetsCollector.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/TestRandomSamplingFacetsCollector.java @@ -1,3 +1,19 @@ +/* + * 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.facet; import java.util.List; @@ -20,23 +36,6 @@ import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; import org.apache.lucene.util.IOUtils; -/* - * 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 TestRandomSamplingFacetsCollector extends FacetTestCase { // The first 50 chi-square value for p-value=0.05, taken from: diff --git a/lucene/facet/src/test/org/apache/lucene/facet/range/TestRangeFacetCounts.java b/lucene/facet/src/test/org/apache/lucene/facet/range/TestRangeFacetCounts.java index f41840e623b..27e1bd6fa47 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/range/TestRangeFacetCounts.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/range/TestRangeFacetCounts.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet.range; - /* * 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.lucene.facet.range; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.range; import java.io.IOException; import java.util.HashMap; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/sortedset/TestSortedSetDocValuesFacets.java b/lucene/facet/src/test/org/apache/lucene/facet/sortedset/TestSortedSetDocValuesFacets.java index b9c29730fca..736a8a7d664 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/sortedset/TestSortedSetDocValuesFacets.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/sortedset/TestSortedSetDocValuesFacets.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet.sortedset; - /* * 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.lucene.facet.sortedset; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.sortedset; import java.util.ArrayList; import java.util.HashMap; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestCachedOrdinalsReader.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestCachedOrdinalsReader.java index 30b07c6d441..693aea3e9b0 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestCachedOrdinalsReader.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestCachedOrdinalsReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet.taxonomy; - /* * 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.lucene.facet.taxonomy; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy; import java.io.IOException; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestFacetLabel.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestFacetLabel.java index 3126e0636ad..41171b3c705 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestFacetLabel.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestFacetLabel.java @@ -1,14 +1,3 @@ -package org.apache.lucene.facet.taxonomy; - -import java.util.Arrays; - -import org.apache.lucene.facet.FacetField; -import org.apache.lucene.facet.FacetTestCase; -import org.apache.lucene.facet.sortedset.SortedSetDocValuesFacetField; -import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.TestUtil; -import org.junit.Test; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -25,6 +14,16 @@ import org.junit.Test; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy; + +import java.util.Arrays; + +import org.apache.lucene.facet.FacetField; +import org.apache.lucene.facet.FacetTestCase; +import org.apache.lucene.facet.sortedset.SortedSetDocValuesFacetField; +import org.apache.lucene.util.BytesRef; +import org.apache.lucene.util.TestUtil; +import org.junit.Test; public class TestFacetLabel extends FacetTestCase { diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestLRUHashMap.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestLRUHashMap.java index f86a7a79907..dec2d43b50e 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestLRUHashMap.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestLRUHashMap.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet.taxonomy; - /* * 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.lucene.facet.taxonomy; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy; import org.apache.lucene.facet.FacetTestCase; import org.apache.lucene.facet.taxonomy.LRUHashMap; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestOrdinalMappingLeafReader.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestOrdinalMappingLeafReader.java index 0ee930f8118..0978b50741e 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestOrdinalMappingLeafReader.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestOrdinalMappingLeafReader.java @@ -1,3 +1,19 @@ +/* + * 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.facet.taxonomy; import java.io.IOException; @@ -28,23 +44,6 @@ import org.apache.lucene.util.IOUtils; import org.junit.Before; import org.junit.Test; -/* - * 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 TestOrdinalMappingLeafReader extends FacetTestCase { private static final int NUM_DOCS = 100; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestSearcherTaxonomyManager.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestSearcherTaxonomyManager.java index eb5e1235528..c6a8b5fccae 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestSearcherTaxonomyManager.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestSearcherTaxonomyManager.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet.taxonomy; - /* * 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.lucene.facet.taxonomy; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyCombined.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyCombined.java index b896e7fe602..559683f6cf5 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyCombined.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyCombined.java @@ -1,20 +1,3 @@ -package org.apache.lucene.facet.taxonomy; - -import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.concurrent.atomic.AtomicBoolean; - -import org.apache.lucene.facet.FacetTestCase; -import org.apache.lucene.facet.SlowRAMDirectory; -import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader; -import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter; -import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; -import org.junit.Test; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -31,6 +14,22 @@ import org.junit.Test; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy; + +import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.concurrent.atomic.AtomicBoolean; + +import org.apache.lucene.facet.FacetTestCase; +import org.apache.lucene.facet.SlowRAMDirectory; +import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader; +import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter; +import org.apache.lucene.store.Directory; +import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; +import org.junit.Test; @SuppressCodecs("SimpleText") public class TestTaxonomyCombined extends FacetTestCase { diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetAssociations.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetAssociations.java index 334ecddb762..a300e47bfb8 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetAssociations.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetAssociations.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet.taxonomy; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,7 +14,7 @@ package org.apache.lucene.facet.taxonomy; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.facet.taxonomy; import org.apache.lucene.document.Document; import org.apache.lucene.facet.DrillDownQuery; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts.java index 241354335d3..78787e4efcf 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet.taxonomy; - /* * 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.lucene.facet.taxonomy; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy; import java.io.ByteArrayOutputStream; import java.io.PrintStream; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts2.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts2.java index d73f4b60a9e..9a84b8def80 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts2.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetCounts2.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet.taxonomy; - /* * 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.lucene.facet.taxonomy; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetSumValueSource.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetSumValueSource.java index fa12b7ee41e..09aa5df3ad7 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetSumValueSource.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestTaxonomyFacetSumValueSource.java @@ -1,5 +1,3 @@ -package org.apache.lucene.facet.taxonomy; - /* * 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.lucene.facet.taxonomy; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy; import java.io.IOException; import java.util.ArrayList; 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 215067b0f44..e3fed138e3f 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,19 +1,3 @@ -package org.apache.lucene.facet.taxonomy.directory; - -import java.io.IOException; -import java.util.HashSet; -import java.util.Random; -import java.util.concurrent.atomic.AtomicInteger; - -import org.apache.lucene.facet.FacetTestCase; -import org.apache.lucene.facet.taxonomy.FacetLabel; -import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter.DiskOrdinalMap; -import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter.MemoryOrdinalMap; -import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter.OrdinalMap; -import org.apache.lucene.store.Directory; -import org.apache.lucene.util.IOUtils; -import org.apache.lucene.util.TestUtil; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -30,6 +14,21 @@ import org.apache.lucene.util.TestUtil; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy.directory; + +import java.io.IOException; +import java.util.HashSet; +import java.util.Random; +import java.util.concurrent.atomic.AtomicInteger; + +import org.apache.lucene.facet.FacetTestCase; +import org.apache.lucene.facet.taxonomy.FacetLabel; +import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter.DiskOrdinalMap; +import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter.MemoryOrdinalMap; +import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter.OrdinalMap; +import org.apache.lucene.store.Directory; +import org.apache.lucene.util.IOUtils; +import org.apache.lucene.util.TestUtil; public class TestAddTaxonomy extends FacetTestCase { diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestConcurrentFacetedIndexing.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestConcurrentFacetedIndexing.java index 679f6a82c26..d80b41091e1 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestConcurrentFacetedIndexing.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestConcurrentFacetedIndexing.java @@ -1,3 +1,19 @@ +/* + * 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.facet.taxonomy.directory; import java.io.IOException; @@ -18,23 +34,6 @@ import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.store.Directory; import org.apache.lucene.util.IOUtils; -/* - * 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. - */ - /** Tests concurrent indexing with facets. */ public class TestConcurrentFacetedIndexing extends FacetTestCase { diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyReader.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyReader.java index edf10f4c004..9b117c038e5 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyReader.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyReader.java @@ -1,3 +1,19 @@ +/* + * 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.facet.taxonomy.directory; import java.io.IOException; @@ -23,23 +39,6 @@ import org.apache.lucene.store.RAMDirectory; import org.apache.lucene.util.IOUtils; import org.junit.Test; -/* - * 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 TestDirectoryTaxonomyReader extends FacetTestCase { @Test diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyWriter.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyWriter.java index dae94ad85b8..2e985988c29 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyWriter.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyWriter.java @@ -1,3 +1,19 @@ +/* + * 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.facet.taxonomy.directory; import java.io.IOException; @@ -32,22 +48,6 @@ import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.TestUtil; import org.junit.Test; -/* - * 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 TestDirectoryTaxonomyWriter extends FacetTestCase { diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/writercache/TestCharBlockArray.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/writercache/TestCharBlockArray.java index e0b1289196f..4914156ca40 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/writercache/TestCharBlockArray.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/writercache/TestCharBlockArray.java @@ -1,19 +1,3 @@ -package org.apache.lucene.facet.taxonomy.writercache; - -import java.io.BufferedInputStream; -import java.io.BufferedOutputStream; -import java.nio.ByteBuffer; -import java.nio.charset.CharsetDecoder; -import java.nio.charset.CodingErrorAction; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Path; - -import org.apache.lucene.facet.FacetTestCase; -import org.apache.lucene.util.TestUtil; - -import org.junit.Test; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -30,6 +14,20 @@ import org.junit.Test; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.facet.taxonomy.writercache; + +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.nio.ByteBuffer; +import java.nio.charset.CharsetDecoder; +import java.nio.charset.CodingErrorAction; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; + +import org.apache.lucene.facet.FacetTestCase; + +import org.junit.Test; public class TestCharBlockArray extends FacetTestCase { diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/writercache/TestCompactLabelToOrdinal.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/writercache/TestCompactLabelToOrdinal.java index 982664544df..3ab277a6c6b 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/writercache/TestCompactLabelToOrdinal.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/writercache/TestCompactLabelToOrdinal.java @@ -1,3 +1,19 @@ +/* ++ * 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.facet.taxonomy.writercache; import java.nio.ByteBuffer; @@ -15,23 +31,6 @@ import org.apache.lucene.facet.taxonomy.FacetLabel; import org.junit.Test; -/* - * 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 TestCompactLabelToOrdinal extends FacetTestCase { @Test diff --git a/lucene/grouping/src/java/org/apache/lucene/search/grouping/AbstractAllGroupHeadsCollector.java b/lucene/grouping/src/java/org/apache/lucene/search/grouping/AbstractAllGroupHeadsCollector.java index 2916c176611..7108762c862 100644 --- a/lucene/grouping/src/java/org/apache/lucene/search/grouping/AbstractAllGroupHeadsCollector.java +++ b/lucene/grouping/src/java/org/apache/lucene/search/grouping/AbstractAllGroupHeadsCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.grouping; - /* * 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.lucene.search.grouping; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.grouping; import java.io.IOException; import java.util.Collection; diff --git a/lucene/grouping/src/java/org/apache/lucene/search/grouping/AbstractAllGroupsCollector.java b/lucene/grouping/src/java/org/apache/lucene/search/grouping/AbstractAllGroupsCollector.java index bc0014f373e..954f9e05598 100644 --- a/lucene/grouping/src/java/org/apache/lucene/search/grouping/AbstractAllGroupsCollector.java +++ b/lucene/grouping/src/java/org/apache/lucene/search/grouping/AbstractAllGroupsCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.grouping; - /* * 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.lucene.search.grouping; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.grouping; import java.io.IOException; import java.util.Collection; diff --git a/lucene/grouping/src/java/org/apache/lucene/search/grouping/AbstractDistinctValuesCollector.java b/lucene/grouping/src/java/org/apache/lucene/search/grouping/AbstractDistinctValuesCollector.java index 345a6e9cd8e..b2181e47cfb 100644 --- a/lucene/grouping/src/java/org/apache/lucene/search/grouping/AbstractDistinctValuesCollector.java +++ b/lucene/grouping/src/java/org/apache/lucene/search/grouping/AbstractDistinctValuesCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.grouping; - /* * 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.lucene.search.grouping; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.grouping; import java.util.HashSet; import java.util.List; diff --git a/lucene/grouping/src/java/org/apache/lucene/search/grouping/AbstractFirstPassGroupingCollector.java b/lucene/grouping/src/java/org/apache/lucene/search/grouping/AbstractFirstPassGroupingCollector.java index f1289c43a84..4c386b60c5c 100644 --- a/lucene/grouping/src/java/org/apache/lucene/search/grouping/AbstractFirstPassGroupingCollector.java +++ b/lucene/grouping/src/java/org/apache/lucene/search/grouping/AbstractFirstPassGroupingCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.grouping; - /* * 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.lucene.search.grouping; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.grouping; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.search.*; diff --git a/lucene/grouping/src/java/org/apache/lucene/search/grouping/AbstractGroupFacetCollector.java b/lucene/grouping/src/java/org/apache/lucene/search/grouping/AbstractGroupFacetCollector.java index 310e3f8fae9..404e3ee3515 100644 --- a/lucene/grouping/src/java/org/apache/lucene/search/grouping/AbstractGroupFacetCollector.java +++ b/lucene/grouping/src/java/org/apache/lucene/search/grouping/AbstractGroupFacetCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.grouping; - /* * 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.lucene.search.grouping; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.grouping; import org.apache.lucene.search.Collector; import org.apache.lucene.search.Scorer; diff --git a/lucene/grouping/src/java/org/apache/lucene/search/grouping/AbstractSecondPassGroupingCollector.java b/lucene/grouping/src/java/org/apache/lucene/search/grouping/AbstractSecondPassGroupingCollector.java index cb928b0ea25..13b618993bc 100644 --- a/lucene/grouping/src/java/org/apache/lucene/search/grouping/AbstractSecondPassGroupingCollector.java +++ b/lucene/grouping/src/java/org/apache/lucene/search/grouping/AbstractSecondPassGroupingCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.grouping; - /* * 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.lucene.search.grouping; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.grouping; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.search.*; diff --git a/lucene/grouping/src/java/org/apache/lucene/search/grouping/BlockGroupingCollector.java b/lucene/grouping/src/java/org/apache/lucene/search/grouping/BlockGroupingCollector.java index a428002198b..66013362c0e 100644 --- a/lucene/grouping/src/java/org/apache/lucene/search/grouping/BlockGroupingCollector.java +++ b/lucene/grouping/src/java/org/apache/lucene/search/grouping/BlockGroupingCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.grouping; - /* * 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.lucene.search.grouping; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.grouping; import java.io.IOException; diff --git a/lucene/grouping/src/java/org/apache/lucene/search/grouping/CollectedSearchGroup.java b/lucene/grouping/src/java/org/apache/lucene/search/grouping/CollectedSearchGroup.java index 63c8871ed30..af6fd043830 100644 --- a/lucene/grouping/src/java/org/apache/lucene/search/grouping/CollectedSearchGroup.java +++ b/lucene/grouping/src/java/org/apache/lucene/search/grouping/CollectedSearchGroup.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.search.grouping; import org.apache.lucene.search.FieldComparator; // javadocs diff --git a/lucene/grouping/src/java/org/apache/lucene/search/grouping/FakeScorer.java b/lucene/grouping/src/java/org/apache/lucene/search/grouping/FakeScorer.java index 882758604e5..b74296ba6b5 100644 --- a/lucene/grouping/src/java/org/apache/lucene/search/grouping/FakeScorer.java +++ b/lucene/grouping/src/java/org/apache/lucene/search/grouping/FakeScorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.grouping; - /* * 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.lucene.search.grouping; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.grouping; import java.io.IOException; diff --git a/lucene/grouping/src/java/org/apache/lucene/search/grouping/GroupDocs.java b/lucene/grouping/src/java/org/apache/lucene/search/grouping/GroupDocs.java index 2ee23ef83df..a3107033f8b 100644 --- a/lucene/grouping/src/java/org/apache/lucene/search/grouping/GroupDocs.java +++ b/lucene/grouping/src/java/org/apache/lucene/search/grouping/GroupDocs.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.grouping; - /* * 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.lucene.search.grouping; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.grouping; import org.apache.lucene.search.ScoreDoc; diff --git a/lucene/grouping/src/java/org/apache/lucene/search/grouping/GroupingSearch.java b/lucene/grouping/src/java/org/apache/lucene/search/grouping/GroupingSearch.java index affa5c087f7..d0bab09b8e9 100644 --- a/lucene/grouping/src/java/org/apache/lucene/search/grouping/GroupingSearch.java +++ b/lucene/grouping/src/java/org/apache/lucene/search/grouping/GroupingSearch.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.grouping; - /* * 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.lucene.search.grouping; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.grouping; import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.search.CachingCollector; diff --git a/lucene/grouping/src/java/org/apache/lucene/search/grouping/SearchGroup.java b/lucene/grouping/src/java/org/apache/lucene/search/grouping/SearchGroup.java index bd31afd4d9c..c9d7fa0863a 100644 --- a/lucene/grouping/src/java/org/apache/lucene/search/grouping/SearchGroup.java +++ b/lucene/grouping/src/java/org/apache/lucene/search/grouping/SearchGroup.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.grouping; - /* * 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.lucene.search.grouping; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.grouping; import org.apache.lucene.search.FieldComparator; import org.apache.lucene.search.Sort; diff --git a/lucene/grouping/src/java/org/apache/lucene/search/grouping/TopGroups.java b/lucene/grouping/src/java/org/apache/lucene/search/grouping/TopGroups.java index 981aef0d381..a60c8f59d67 100644 --- a/lucene/grouping/src/java/org/apache/lucene/search/grouping/TopGroups.java +++ b/lucene/grouping/src/java/org/apache/lucene/search/grouping/TopGroups.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.grouping; - /* * 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.lucene.search.grouping; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.grouping; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.Sort; diff --git a/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupHeadsCollector.java b/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupHeadsCollector.java index f1e53a66f10..4c6071caf07 100644 --- a/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupHeadsCollector.java +++ b/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupHeadsCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.grouping.function; - /* * 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.lucene.search.grouping.function; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.grouping.function; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.queries.function.FunctionValues; diff --git a/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupsCollector.java b/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupsCollector.java index b68b5a73432..58418edce2b 100644 --- a/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupsCollector.java +++ b/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionAllGroupsCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.grouping.function; - /* * 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.lucene.search.grouping.function; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.grouping.function; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.queries.function.FunctionValues; diff --git a/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionDistinctValuesCollector.java b/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionDistinctValuesCollector.java index 2c11ff057d2..32e9324f236 100644 --- a/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionDistinctValuesCollector.java +++ b/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionDistinctValuesCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.grouping.function; - /* * 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.lucene.search.grouping.function; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.grouping.function; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.queries.function.FunctionValues; diff --git a/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionFirstPassGroupingCollector.java b/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionFirstPassGroupingCollector.java index 73866fb9e30..36579a6873d 100644 --- a/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionFirstPassGroupingCollector.java +++ b/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionFirstPassGroupingCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.grouping.function; - /* * 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.lucene.search.grouping.function; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.grouping.function; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.queries.function.FunctionValues; diff --git a/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionSecondPassGroupingCollector.java b/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionSecondPassGroupingCollector.java index a5e0db36eef..d3632679c58 100644 --- a/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionSecondPassGroupingCollector.java +++ b/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/FunctionSecondPassGroupingCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.grouping.function; - /* * 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.lucene.search.grouping.function; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.grouping.function; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.queries.function.FunctionValues; diff --git a/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/package-info.java b/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/package-info.java index 73588ce2463..ce2558235eb 100644 --- a/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/package-info.java +++ b/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Support for grouping by {@link org.apache.lucene.queries.function.ValueSource}. */ diff --git a/lucene/grouping/src/java/org/apache/lucene/search/grouping/package-info.java b/lucene/grouping/src/java/org/apache/lucene/search/grouping/package-info.java index 824a98e31bf..3af4adfe66b 100644 --- a/lucene/grouping/src/java/org/apache/lucene/search/grouping/package-info.java +++ b/lucene/grouping/src/java/org/apache/lucene/search/grouping/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Grouping. *

diff --git a/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermAllGroupHeadsCollector.java b/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermAllGroupHeadsCollector.java index 687dbcb915a..ae01e339d04 100644 --- a/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermAllGroupHeadsCollector.java +++ b/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermAllGroupHeadsCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.grouping.term; - /* * 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.lucene.search.grouping.term; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.grouping.term; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.DocValues; diff --git a/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermAllGroupsCollector.java b/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermAllGroupsCollector.java index 45e643ef8d4..f79964d8dd7 100644 --- a/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermAllGroupsCollector.java +++ b/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermAllGroupsCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.grouping.term; - /* * 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.lucene.search.grouping.term; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.grouping.term; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.DocValues; diff --git a/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermDistinctValuesCollector.java b/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermDistinctValuesCollector.java index 87e1c279f85..ab492d05b61 100644 --- a/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermDistinctValuesCollector.java +++ b/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermDistinctValuesCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.grouping.term; - /* * 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.lucene.search.grouping.term; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.grouping.term; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.DocValues; diff --git a/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermFirstPassGroupingCollector.java b/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermFirstPassGroupingCollector.java index 61e66a980cc..4c50254e37d 100644 --- a/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermFirstPassGroupingCollector.java +++ b/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermFirstPassGroupingCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.grouping.term; - /* * 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.lucene.search.grouping.term; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.grouping.term; import java.io.IOException; diff --git a/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermGroupFacetCollector.java b/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermGroupFacetCollector.java index 7a78c1ee230..5c36fe12b14 100644 --- a/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermGroupFacetCollector.java +++ b/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermGroupFacetCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.grouping.term; - /* * 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.lucene.search.grouping.term; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.grouping.term; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.DocValues; diff --git a/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermSecondPassGroupingCollector.java b/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermSecondPassGroupingCollector.java index 39b71cb24e9..92928563dfc 100644 --- a/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermSecondPassGroupingCollector.java +++ b/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermSecondPassGroupingCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.grouping.term; - /* * 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.lucene.search.grouping.term; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.grouping.term; import java.io.IOException; import java.util.Collection; diff --git a/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/package-info.java b/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/package-info.java index 27320118d7c..7965ecaa80b 100644 --- a/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/package-info.java +++ b/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Support for grouping by indexed terms via {@link org.apache.lucene.index.DocValues}. */ diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/AbstractGroupingTestCase.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/AbstractGroupingTestCase.java index b8e3a7ffe58..3c3b9f900d6 100644 --- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/AbstractGroupingTestCase.java +++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/AbstractGroupingTestCase.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.grouping; - /* * 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.lucene.search.grouping; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.grouping; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.TestUtil; diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java index 2308acfcd38..9bdb8f51251 100644 --- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java +++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.grouping; - /* * 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.lucene.search.grouping; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.grouping; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupsCollectorTest.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupsCollectorTest.java index 7b72864dac5..30a147e8b33 100644 --- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupsCollectorTest.java +++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/AllGroupsCollectorTest.java @@ -1,11 +1,9 @@ -package org.apache.lucene.search.grouping; - /* * 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 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 @@ -16,6 +14,7 @@ package org.apache.lucene.search.grouping; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.grouping; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/DistinctValuesCollectorTest.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/DistinctValuesCollectorTest.java index ccb057eb22f..6a7d9ca6f49 100644 --- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/DistinctValuesCollectorTest.java +++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/DistinctValuesCollectorTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.grouping; - /* * 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.lucene.search.grouping; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.grouping; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java index 4ffc728b071..82bbd393480 100644 --- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java +++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.grouping; - /* * 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.lucene.search.grouping; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.grouping; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupingSearchTest.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupingSearchTest.java index 30c9d144243..d13bfd73e4b 100644 --- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupingSearchTest.java +++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupingSearchTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.grouping; - /* * 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.lucene.search.grouping; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.grouping; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java index 28425283fd7..a3bda0b3a6f 100644 --- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java +++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.search.grouping; import java.io.IOException; diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/DefaultEncoder.java b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/DefaultEncoder.java index c87671119f7..baae18ae0cd 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/DefaultEncoder.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/DefaultEncoder.java @@ -1,10 +1,10 @@ -package org.apache.lucene.search.highlight; /* - * Copyright 2005 The Apache Software Foundation - * - * Licensed 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 + * 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 * @@ -14,20 +14,18 @@ package org.apache.lucene.search.highlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.highlight; /** * Simple {@link Encoder} implementation that does not modify the output * */ -public class DefaultEncoder implements Encoder -{ - public DefaultEncoder() - { +public class DefaultEncoder implements Encoder { + public DefaultEncoder() { } @Override - public String encodeText(String originalText) - { + public String encodeText(String originalText) { return originalText; } } \ No newline at end of file diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/Encoder.java b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/Encoder.java index ee09fa927b3..eb2a95782f8 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/Encoder.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/Encoder.java @@ -1,10 +1,10 @@ -package org.apache.lucene.search.highlight; /* - * Copyright 2005 The Apache Software Foundation - * - * Licensed 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 + * 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 * @@ -14,14 +14,13 @@ package org.apache.lucene.search.highlight; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.search.highlight; /** * Encodes original text. The Encoder works with the {@link Formatter} to generate output. * */ -public interface Encoder -{ +public interface Encoder { /** * @param originalText The section of text being output */ diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/Formatter.java b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/Formatter.java index d75663bb049..8b010efdf83 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/Formatter.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/Formatter.java @@ -1,4 +1,3 @@ -package org.apache.lucene.search.highlight; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,8 +14,7 @@ package org.apache.lucene.search.highlight; * See the License for the specific language governing permissions and * limitations under the License. */ - - +package org.apache.lucene.search.highlight; /** * Processes terms found in the original text, typically by applying some form * of mark-up to highlight terms in HTML search results pages. diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/Fragmenter.java b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/Fragmenter.java index 27f07602b7f..8c0187cebf9 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/Fragmenter.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/Fragmenter.java @@ -1,4 +1,3 @@ -package org.apache.lucene.search.highlight; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.search.highlight; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.search.highlight; import org.apache.lucene.analysis.TokenStream; /** diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/GradientFormatter.java b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/GradientFormatter.java index c837bbf7b01..7212f41ae66 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/GradientFormatter.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/GradientFormatter.java @@ -1,4 +1,3 @@ -package org.apache.lucene.search.highlight; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.search.highlight; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.search.highlight; /** * Formats text with different color intensity depending on the score of the * term. diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/Highlighter.java b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/Highlighter.java index 5e1634795e5..85e73df8ebb 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/Highlighter.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/Highlighter.java @@ -1,4 +1,3 @@ -package org.apache.lucene.search.highlight; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.search.highlight; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.search.highlight; import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/InvalidTokenOffsetsException.java b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/InvalidTokenOffsetsException.java index 633b4f4f965..fe353a22c49 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/InvalidTokenOffsetsException.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/InvalidTokenOffsetsException.java @@ -1,4 +1,3 @@ -package org.apache.lucene.search.highlight; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.search.highlight; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.search.highlight; /** * Exception thrown if TokenStream Tokens are incompatible with provided text * diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/NullFragmenter.java b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/NullFragmenter.java index 5759d1933d4..e6052219605 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/NullFragmenter.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/NullFragmenter.java @@ -1,4 +1,3 @@ -package org.apache.lucene.search.highlight; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.search.highlight; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.search.highlight; import org.apache.lucene.analysis.TokenStream; /** diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/OffsetLimitTokenFilter.java b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/OffsetLimitTokenFilter.java index f660d1954f5..23557b54ccd 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/OffsetLimitTokenFilter.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/OffsetLimitTokenFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.highlight; - /* * 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.lucene.search.highlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.highlight; import java.io.IOException; diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/PositionSpan.java b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/PositionSpan.java index 355ec6c4828..ac7a9d02be2 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/PositionSpan.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/PositionSpan.java @@ -1,4 +1,3 @@ -package org.apache.lucene.search.highlight; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.search.highlight; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.search.highlight; /** * Utility class to record Positions Spans * @lucene.internal diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/QueryScorer.java b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/QueryScorer.java index 56b4b2da6c2..25d9b3c7e5a 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/QueryScorer.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/QueryScorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.highlight; - /* * 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.lucene.search.highlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.highlight; import java.io.IOException; import java.util.HashMap; diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/QueryTermExtractor.java b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/QueryTermExtractor.java index 6b471bec7ec..3adf6d0d3c5 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/QueryTermExtractor.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/QueryTermExtractor.java @@ -1,4 +1,3 @@ -package org.apache.lucene.search.highlight; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.search.highlight; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.search.highlight; import java.io.IOException; import java.util.HashSet; import java.util.Iterator; diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/QueryTermScorer.java b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/QueryTermScorer.java index 69f93ec4c45..229b42c369a 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/QueryTermScorer.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/QueryTermScorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.highlight; - /* * 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.lucene.search.highlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.highlight; import java.util.HashMap; import java.util.HashSet; diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/Scorer.java b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/Scorer.java index 19fa1808242..fd8f48421ad 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/Scorer.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/Scorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.highlight; - /* * 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.lucene.search.highlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.highlight; import java.io.IOException; diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/SimpleFragmenter.java b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/SimpleFragmenter.java index 881beb98cb2..4f25c3a7b33 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/SimpleFragmenter.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/SimpleFragmenter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.highlight; - /* * 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.lucene.search.highlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.highlight; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/SimpleHTMLEncoder.java b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/SimpleHTMLEncoder.java index 82d92d70636..7e7630db2c1 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/SimpleHTMLEncoder.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/SimpleHTMLEncoder.java @@ -1,10 +1,10 @@ -package org.apache.lucene.search.highlight; /* - * Copyright 2005 The Apache Software Foundation - * - * Licensed 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 + * 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 * @@ -14,15 +14,14 @@ package org.apache.lucene.search.highlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.highlight; /** * Simple {@link Encoder} implementation to escape text for HTML output * */ -public class SimpleHTMLEncoder implements Encoder -{ - public SimpleHTMLEncoder() - { +public class SimpleHTMLEncoder implements Encoder { + public SimpleHTMLEncoder() { } @Override diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/SimpleHTMLFormatter.java b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/SimpleHTMLFormatter.java index 3210826bad0..fec39711908 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/SimpleHTMLFormatter.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/SimpleHTMLFormatter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.highlight; - /* * 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.lucene.search.highlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.highlight; /** * Simple {@link Formatter} implementation to highlight terms with a pre and diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/SimpleSpanFragmenter.java b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/SimpleSpanFragmenter.java index 0b46a8a6daa..7b708d8dcf1 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/SimpleSpanFragmenter.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/SimpleSpanFragmenter.java @@ -1,6 +1,3 @@ -package org.apache.lucene.search.highlight; - - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +14,9 @@ package org.apache.lucene.search.highlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.highlight; + + import java.util.List; import org.apache.lucene.analysis.TokenStream; diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/SpanGradientFormatter.java b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/SpanGradientFormatter.java index 5e6df1e0307..e1088144128 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/SpanGradientFormatter.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/SpanGradientFormatter.java @@ -1,4 +1,3 @@ -package org.apache.lucene.search.highlight; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.search.highlight; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.search.highlight; /** * Formats text with different color intensity depending on the score of the * term using the span tag. GradientFormatter uses a bgcolor argument to the font tag which diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TermVectorLeafReader.java b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TermVectorLeafReader.java index 3a637027bb7..4d76fa9dd39 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TermVectorLeafReader.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TermVectorLeafReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.highlight; - /* * 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.lucene.search.highlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.highlight; import java.io.IOException; import java.util.Collections; diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TextFragment.java b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TextFragment.java index 1005afa0344..d71954f50ea 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TextFragment.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TextFragment.java @@ -1,4 +1,3 @@ -package org.apache.lucene.search.highlight; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,8 +14,7 @@ package org.apache.lucene.search.highlight; * See the License for the specific language governing permissions and * limitations under the License. */ - - +package org.apache.lucene.search.highlight; /** * Low-level class used to record information about a section of a document * with a score. diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenGroup.java b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenGroup.java index cc0d5174e83..6af89f8c24f 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenGroup.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenGroup.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.highlight; - /* * 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.lucene.search.highlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.highlight; import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenStream; diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java index 4fac51579ff..2730f40409a 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenSources.java @@ -1,8 +1,6 @@ /* * Created on 28-Oct-2004 */ -package org.apache.lucene.search.highlight; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -19,6 +17,7 @@ package org.apache.lucene.search.highlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.highlight; import java.io.IOException; diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenStreamFromTermVector.java b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenStreamFromTermVector.java index c9329225d63..346ecba013d 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenStreamFromTermVector.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenStreamFromTermVector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.highlight; - /* * 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.lucene.search.highlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.highlight; import java.io.IOException; diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTerm.java b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTerm.java index 6a066836918..ee9cf3a8ec8 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTerm.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTerm.java @@ -1,6 +1,3 @@ -package org.apache.lucene.search.highlight; - - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +14,9 @@ package org.apache.lucene.search.highlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.highlight; + + import java.util.ArrayList; import java.util.Iterator; import java.util.List; diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java index 19050c00622..a73ebf8ec27 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/WeightedSpanTermExtractor.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.highlight; - /* * 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.lucene.search.highlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.highlight; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/WeightedTerm.java b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/WeightedTerm.java index 68a7a2ba6d2..7fba55e17ff 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/WeightedTerm.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/WeightedTerm.java @@ -1,4 +1,3 @@ -package org.apache.lucene.search.highlight; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.search.highlight; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.search.highlight; /** Lightweight class to hold term and a weight value used for scoring this term */ public class WeightedTerm diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/package-info.java b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/package-info.java index a435ff5111e..5648759a29d 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/package-info.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Highlighting search terms. *

diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/CustomSeparatorBreakIterator.java b/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/CustomSeparatorBreakIterator.java index 59a284db7ea..651901743b6 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/CustomSeparatorBreakIterator.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/CustomSeparatorBreakIterator.java @@ -1,8 +1,3 @@ -package org.apache.lucene.search.postingshighlight; - -import java.text.BreakIterator; -import java.text.CharacterIterator; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -19,6 +14,10 @@ import java.text.CharacterIterator; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.postingshighlight; + +import java.text.BreakIterator; +import java.text.CharacterIterator; /** * A {@link BreakIterator} that breaks the text whenever a certain separator, provided as a constructor argument, is found. diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/DefaultPassageFormatter.java b/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/DefaultPassageFormatter.java index a1f33dfb193..73822c85067 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/DefaultPassageFormatter.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/DefaultPassageFormatter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.postingshighlight; - /* * 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.lucene.search.postingshighlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.postingshighlight; /** * Creates a formatted snippet from the top passages. diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/MultiTermHighlighting.java b/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/MultiTermHighlighting.java index 21e9250d6fe..56345c214d9 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/MultiTermHighlighting.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/MultiTermHighlighting.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.postingshighlight; - /* * 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.lucene.search.postingshighlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.postingshighlight; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/Passage.java b/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/Passage.java index 1c206cd8861..50aebeac4dc 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/Passage.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/Passage.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.postingshighlight; - /* * 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.lucene.search.postingshighlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.postingshighlight; import org.apache.lucene.util.ArrayUtil; import org.apache.lucene.util.BytesRef; diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/PassageFormatter.java b/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/PassageFormatter.java index e1e7bfbc60d..f1596c17dc9 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/PassageFormatter.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/PassageFormatter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.postingshighlight; - /* * 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.lucene.search.postingshighlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.postingshighlight; /** * Creates a formatted snippet from the top passages. diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/PassageScorer.java b/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/PassageScorer.java index 1e732f9d20e..1f74f7a2103 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/PassageScorer.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/PassageScorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.postingshighlight; - /* * 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.lucene.search.postingshighlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.postingshighlight; /** * Ranks passages found by {@link PostingsHighlighter}. diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/PostingsHighlighter.java b/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/PostingsHighlighter.java index 7a98e803326..3c0a42814f0 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/PostingsHighlighter.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/PostingsHighlighter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.postingshighlight; - /* * 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.lucene.search.postingshighlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.postingshighlight; import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/WholeBreakIterator.java b/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/WholeBreakIterator.java index b519c6c7f1d..851dcf35ecf 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/WholeBreakIterator.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/WholeBreakIterator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.postingshighlight; - /* * 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.lucene.search.postingshighlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.postingshighlight; import java.text.BreakIterator; import java.text.CharacterIterator; diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/package-info.java b/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/package-info.java index 10013c2cd6c..33e752019e9 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/package-info.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Highlighter implementation that uses offsets from postings lists. */ diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragListBuilder.java b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragListBuilder.java index 058b5789855..888eeccfa05 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragListBuilder.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragListBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.vectorhighlight; - /* * 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.lucene.search.vectorhighlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.vectorhighlight; import java.util.ArrayList; import java.util.Iterator; diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java index 19de0a2f52a..15bcfcd63b8 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.vectorhighlight; - /* * 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.lucene.search.vectorhighlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.vectorhighlight; import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BoundaryScanner.java b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BoundaryScanner.java index 4c533617c09..175466189b9 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BoundaryScanner.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BoundaryScanner.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.vectorhighlight; - /* * 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.lucene.search.vectorhighlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.vectorhighlight; /** * Finds fragment boundaries: pluggable into {@link BaseFragmentsBuilder} diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BreakIteratorBoundaryScanner.java b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BreakIteratorBoundaryScanner.java index d728a42facf..1c4042ceea4 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BreakIteratorBoundaryScanner.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BreakIteratorBoundaryScanner.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.vectorhighlight; - /* * 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.lucene.search.vectorhighlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.vectorhighlight; import java.text.BreakIterator; diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FastVectorHighlighter.java b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FastVectorHighlighter.java index 79240371133..4845de69e70 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FastVectorHighlighter.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FastVectorHighlighter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.vectorhighlight; - /* * 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.lucene.search.vectorhighlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.vectorhighlight; import java.io.IOException; import java.util.Iterator; diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldFragList.java b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldFragList.java index 119ff43048f..c4903504f23 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldFragList.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldFragList.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.vectorhighlight; - /* * 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.lucene.search.vectorhighlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.vectorhighlight; import org.apache.lucene.search.vectorhighlight.FieldPhraseList.WeightedPhraseInfo; import org.apache.lucene.search.vectorhighlight.FieldPhraseList.WeightedPhraseInfo.Toffs; diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldPhraseList.java b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldPhraseList.java index c8e196e3017..2d9fb2f86d1 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldPhraseList.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldPhraseList.java @@ -1,4 +1,3 @@ -package org.apache.lucene.search.vectorhighlight; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.search.vectorhighlight; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.search.vectorhighlight; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldQuery.java b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldQuery.java index dc7c1a3e821..ac6cd94d2ce 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldQuery.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldQuery.java @@ -1,4 +1,3 @@ -package org.apache.lucene.search.vectorhighlight; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.search.vectorhighlight; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.search.vectorhighlight; import java.io.IOException; import java.util.Collection; import java.util.HashMap; diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java index b7cabf606a1..f67ba804434 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java @@ -1,4 +1,3 @@ -package org.apache.lucene.search.vectorhighlight; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.search.vectorhighlight; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.search.vectorhighlight; import java.io.IOException; import java.util.Collections; import java.util.Iterator; diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FragListBuilder.java b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FragListBuilder.java index 8440cc97c6c..ddcdf9dd290 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FragListBuilder.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FragListBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.vectorhighlight; - /* * 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.lucene.search.vectorhighlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.vectorhighlight; /** * FragListBuilder is an interface for FieldFragList builder classes. diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FragmentsBuilder.java b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FragmentsBuilder.java index a0c84e8afaa..854b7c616d8 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FragmentsBuilder.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FragmentsBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.vectorhighlight; - /* * 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.lucene.search.vectorhighlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.vectorhighlight; import java.io.IOException; diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/ScoreOrderFragmentsBuilder.java b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/ScoreOrderFragmentsBuilder.java index 4ace26d53a3..8adc114afa1 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/ScoreOrderFragmentsBuilder.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/ScoreOrderFragmentsBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.vectorhighlight; - /* * 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.lucene.search.vectorhighlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.vectorhighlight; import java.util.Collections; import java.util.Comparator; diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleBoundaryScanner.java b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleBoundaryScanner.java index 6adfefdf809..af9dfb6cff7 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleBoundaryScanner.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleBoundaryScanner.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.vectorhighlight; - /* * 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.lucene.search.vectorhighlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.vectorhighlight; import java.util.Arrays; import java.util.HashSet; diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleFieldFragList.java b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleFieldFragList.java index 09d29e6a9b6..878613860ba 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleFieldFragList.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleFieldFragList.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.vectorhighlight; - /* * 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.lucene.search.vectorhighlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.vectorhighlight; import java.util.ArrayList; import java.util.List; diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilder.java b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilder.java index 32f0f99ec34..4681d42b4a4 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilder.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.vectorhighlight; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,7 +14,7 @@ package org.apache.lucene.search.vectorhighlight; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.search.vectorhighlight; /** * A simple implementation of {@link FragListBuilder}. diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilder.java b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilder.java index 026c97c9e67..5901fc52cb4 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilder.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.vectorhighlight; - /* * 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.lucene.search.vectorhighlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.vectorhighlight; import java.util.List; diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SingleFragListBuilder.java b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SingleFragListBuilder.java index ebe6fad5fce..e86b3f7ddb1 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SingleFragListBuilder.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SingleFragListBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.vectorhighlight; - /* * 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.lucene.search.vectorhighlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.vectorhighlight; import java.util.ArrayList; import java.util.Iterator; diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/WeightedFieldFragList.java b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/WeightedFieldFragList.java index 154259dab26..aa8e9dd13e8 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/WeightedFieldFragList.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/WeightedFieldFragList.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.vectorhighlight; - /* * 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.lucene.search.vectorhighlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.vectorhighlight; import java.util.ArrayList; import java.util.HashSet; diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/WeightedFragListBuilder.java b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/WeightedFragListBuilder.java index 621287589c3..b109efd8290 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/WeightedFragListBuilder.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/WeightedFragListBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.vectorhighlight; - /* * 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.lucene.search.vectorhighlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.vectorhighlight; /** * A weighted implementation of {@link FragListBuilder}. diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/package-info.java b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/package-info.java index 39d0f5d5441..2784714a922 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/package-info.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Another highlighter implementation based on term vectors. * diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java index afb5c7b7631..5baf59c4cb6 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterPhraseTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.highlight; - /* * 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.lucene.search.highlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.highlight; import java.io.IOException; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java index bbc5c229718..26ad75527e8 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.highlight; - /* * 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.lucene.search.highlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.highlight; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/MissesTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/MissesTest.java index 6f7f04bb706..6289faf8e5b 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/MissesTest.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/MissesTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.highlight; - /* * 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.lucene.search.highlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.highlight; import java.io.IOException; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/OffsetLimitTokenFilterTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/OffsetLimitTokenFilterTest.java index b45cb279b3f..16cee83676f 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/OffsetLimitTokenFilterTest.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/OffsetLimitTokenFilterTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.highlight; - /* * 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.lucene.search.highlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.highlight; import java.io.Reader; import java.io.StringReader; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java index 85a1f0365b8..581ff2f77e7 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/TokenSourcesTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.highlight; - /* * 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.lucene.search.highlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.highlight; import java.io.IOException; import java.util.Arrays; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/custom/HighlightCustomQueryTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/custom/HighlightCustomQueryTest.java index a494e9e7732..36c6d2ae297 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/highlight/custom/HighlightCustomQueryTest.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/highlight/custom/HighlightCustomQueryTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.highlight.custom; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search.highlight.custom; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.highlight.custom; + import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.MockTokenFilter; import org.apache.lucene.analysis.MockTokenizer; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestCustomSeparatorBreakIterator.java b/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestCustomSeparatorBreakIterator.java index 4b440f54266..29e7e97d607 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestCustomSeparatorBreakIterator.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestCustomSeparatorBreakIterator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.postingshighlight; - /* * 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.lucene.search.postingshighlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.postingshighlight; import com.carrotsearch.randomizedtesting.generators.RandomPicks; import org.apache.lucene.util.LuceneTestCase; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestMultiTermHighlighting.java b/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestMultiTermHighlighting.java index 99ef2372406..0620bd6389a 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestMultiTermHighlighting.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestMultiTermHighlighting.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.postingshighlight; - /* * 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.lucene.search.postingshighlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.postingshighlight; import java.util.Collections; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestPostingsHighlighter.java b/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestPostingsHighlighter.java index 6fda49042b3..6574b6273a5 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestPostingsHighlighter.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestPostingsHighlighter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.postingshighlight; - /* * 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.lucene.search.postingshighlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.postingshighlight; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.MockAnalyzer; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestPostingsHighlighterRanking.java b/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestPostingsHighlighterRanking.java index 692e78bfbf4..7a693d96107 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestPostingsHighlighterRanking.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestPostingsHighlighterRanking.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.postingshighlight; - /* * 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.lucene.search.postingshighlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.postingshighlight; import java.io.IOException; import java.util.HashSet; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestWholeBreakIterator.java b/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestWholeBreakIterator.java index 8021a28a45b..43249ea8685 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestWholeBreakIterator.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/postingshighlight/TestWholeBreakIterator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.postingshighlight; - /* * 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.lucene.search.postingshighlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.postingshighlight; import org.apache.lucene.util.LuceneTestCase; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java index 0cc975e6a1c..be75e64c3ce 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.vectorhighlight; - /* * 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.lucene.search.vectorhighlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.vectorhighlight; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/BreakIteratorBoundaryScannerTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/BreakIteratorBoundaryScannerTest.java index cf4574eb94d..330701d9df9 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/BreakIteratorBoundaryScannerTest.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/BreakIteratorBoundaryScannerTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.vectorhighlight; - /* * 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.lucene.search.vectorhighlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.vectorhighlight; import java.text.BreakIterator; import java.util.Locale; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FastVectorHighlighterTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FastVectorHighlighterTest.java index 1c20f0ba76d..5a2d5a07973 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FastVectorHighlighterTest.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FastVectorHighlighterTest.java @@ -1,4 +1,3 @@ -package org.apache.lucene.search.vectorhighlight; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.search.vectorhighlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.vectorhighlight; import java.io.IOException; import java.util.HashSet; import java.util.Map; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldPhraseListTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldPhraseListTest.java index d86cd1809e4..ed120f67eb6 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldPhraseListTest.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldPhraseListTest.java @@ -1,4 +1,3 @@ -package org.apache.lucene.search.vectorhighlight; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.search.vectorhighlight; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.search.vectorhighlight; import java.util.LinkedList; import org.apache.lucene.search.BooleanQuery; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldQueryTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldQueryTest.java index de7a9d5e71f..70ed833491b 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldQueryTest.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldQueryTest.java @@ -1,4 +1,3 @@ -package org.apache.lucene.search.vectorhighlight; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.search.vectorhighlight; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.search.vectorhighlight; import java.io.IOException; import java.util.ArrayList; import java.util.HashSet; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldTermStackTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldTermStackTest.java index 630b24f8851..3e047130342 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldTermStackTest.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/FieldTermStackTest.java @@ -1,4 +1,3 @@ -package org.apache.lucene.search.vectorhighlight; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.search.vectorhighlight; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.search.vectorhighlight; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.BooleanClause.Occur; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/IndexTimeSynonymTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/IndexTimeSynonymTest.java index 123366a1e4f..d48ae94803e 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/IndexTimeSynonymTest.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/IndexTimeSynonymTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.vectorhighlight; - /* * 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.lucene.search.vectorhighlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.vectorhighlight; import java.io.IOException; import java.io.Reader; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/ScoreOrderFragmentsBuilderTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/ScoreOrderFragmentsBuilderTest.java index 344fdac6e63..6926d9ee49a 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/ScoreOrderFragmentsBuilderTest.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/ScoreOrderFragmentsBuilderTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.vectorhighlight; - /* * 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.lucene.search.vectorhighlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.vectorhighlight; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleBoundaryScannerTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleBoundaryScannerTest.java index 343af8420ec..575173176fd 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleBoundaryScannerTest.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleBoundaryScannerTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.vectorhighlight; - /* * 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.lucene.search.vectorhighlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.vectorhighlight; import org.apache.lucene.util.LuceneTestCase; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilderTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilderTest.java index e18b4c02139..f21e0dd70bb 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilderTest.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragListBuilderTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.vectorhighlight; - /* * 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.lucene.search.vectorhighlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.vectorhighlight; import org.apache.lucene.index.Term; import org.apache.lucene.search.*; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java index ff0f0059e8d..df9a1047694 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SimpleFragmentsBuilderTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.vectorhighlight; - /* * 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.lucene.search.vectorhighlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.vectorhighlight; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SingleFragListBuilderTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SingleFragListBuilderTest.java index 740b63eb828..9c880feb3fd 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SingleFragListBuilderTest.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/SingleFragListBuilderTest.java @@ -1,9 +1,3 @@ -package org.apache.lucene.search.vectorhighlight; - -import org.apache.lucene.index.Term; -import org.apache.lucene.search.Query; -import org.apache.lucene.search.TermQuery; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -20,6 +14,11 @@ import org.apache.lucene.search.TermQuery; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.vectorhighlight; + +import org.apache.lucene.index.Term; +import org.apache.lucene.search.Query; +import org.apache.lucene.search.TermQuery; public class SingleFragListBuilderTest extends AbstractTestCase { diff --git a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/WeightedFragListBuilderTest.java b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/WeightedFragListBuilderTest.java index 9b6432a7c58..7fe410b862f 100644 --- a/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/WeightedFragListBuilderTest.java +++ b/lucene/highlighter/src/test/org/apache/lucene/search/vectorhighlight/WeightedFragListBuilderTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.vectorhighlight; - /* * 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.lucene.search.vectorhighlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.vectorhighlight; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.BooleanQuery; diff --git a/lucene/join/src/java/org/apache/lucene/search/join/BaseGlobalOrdinalScorer.java b/lucene/join/src/java/org/apache/lucene/search/join/BaseGlobalOrdinalScorer.java index 71767067e16..507d6a625d0 100644 --- a/lucene/join/src/java/org/apache/lucene/search/join/BaseGlobalOrdinalScorer.java +++ b/lucene/join/src/java/org/apache/lucene/search/join/BaseGlobalOrdinalScorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.join; - /* * 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.lucene.search.join; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.join; import org.apache.lucene.index.SortedDocValues; import org.apache.lucene.search.DocIdSetIterator; diff --git a/lucene/join/src/java/org/apache/lucene/search/join/BitSetProducer.java b/lucene/join/src/java/org/apache/lucene/search/join/BitSetProducer.java index dfbc4f7883e..94fda84d6ba 100644 --- a/lucene/join/src/java/org/apache/lucene/search/join/BitSetProducer.java +++ b/lucene/join/src/java/org/apache/lucene/search/join/BitSetProducer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.join; - /* * 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.lucene.search.join; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.join; import java.io.IOException; diff --git a/lucene/join/src/java/org/apache/lucene/search/join/BlockJoinSelector.java b/lucene/join/src/java/org/apache/lucene/search/join/BlockJoinSelector.java index d23f6d48172..509c1e9cf4a 100644 --- a/lucene/join/src/java/org/apache/lucene/search/join/BlockJoinSelector.java +++ b/lucene/join/src/java/org/apache/lucene/search/join/BlockJoinSelector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.join; - /* * 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.lucene.search.join; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.join; import org.apache.lucene.index.DocValues; import org.apache.lucene.index.NumericDocValues; diff --git a/lucene/join/src/java/org/apache/lucene/search/join/CheckJoinIndex.java b/lucene/join/src/java/org/apache/lucene/search/join/CheckJoinIndex.java index be5e3848c62..025aeef217a 100644 --- a/lucene/join/src/java/org/apache/lucene/search/join/CheckJoinIndex.java +++ b/lucene/join/src/java/org/apache/lucene/search/join/CheckJoinIndex.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.join; - /* * 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.lucene.search.join; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.join; import java.io.IOException; diff --git a/lucene/join/src/java/org/apache/lucene/search/join/DocValuesTermsCollector.java b/lucene/join/src/java/org/apache/lucene/search/join/DocValuesTermsCollector.java index 2f1f1c641de..a9b11ed7008 100644 --- a/lucene/join/src/java/org/apache/lucene/search/join/DocValuesTermsCollector.java +++ b/lucene/join/src/java/org/apache/lucene/search/join/DocValuesTermsCollector.java @@ -1,3 +1,19 @@ +/* + * 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; @@ -17,23 +33,6 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; import org.apache.lucene.util.LegacyNumericUtils; -/* - * 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. - */ - abstract class DocValuesTermsCollector extends SimpleCollector { @FunctionalInterface diff --git a/lucene/join/src/java/org/apache/lucene/search/join/FakeScorer.java b/lucene/join/src/java/org/apache/lucene/search/join/FakeScorer.java index f0bb798f512..a88b12f9cd1 100644 --- a/lucene/join/src/java/org/apache/lucene/search/join/FakeScorer.java +++ b/lucene/join/src/java/org/apache/lucene/search/join/FakeScorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.join; - /* * 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.lucene.search.join; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.join; import java.io.IOException; diff --git a/lucene/join/src/java/org/apache/lucene/search/join/GenericTermsCollector.java b/lucene/join/src/java/org/apache/lucene/search/join/GenericTermsCollector.java index 2ae2f29d184..ef8b3c100dd 100644 --- a/lucene/join/src/java/org/apache/lucene/search/join/GenericTermsCollector.java +++ b/lucene/join/src/java/org/apache/lucene/search/join/GenericTermsCollector.java @@ -1,19 +1,3 @@ -package org.apache.lucene.search.join; - -import java.io.IOException; -import java.io.PrintStream; - -import org.apache.lucene.index.BinaryDocValues; -import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.index.SortedSetDocValues; -import org.apache.lucene.search.Collector; -import org.apache.lucene.search.LeafCollector; -import org.apache.lucene.search.join.DocValuesTermsCollector.Function; -import org.apache.lucene.search.join.TermsWithScoreCollector.MV; -import org.apache.lucene.search.join.TermsWithScoreCollector.SV; -import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.BytesRefHash; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -30,6 +14,21 @@ import org.apache.lucene.util.BytesRefHash; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.join; + +import java.io.IOException; +import java.io.PrintStream; + +import org.apache.lucene.index.BinaryDocValues; +import org.apache.lucene.index.LeafReaderContext; +import org.apache.lucene.index.SortedSetDocValues; +import org.apache.lucene.search.Collector; +import org.apache.lucene.search.LeafCollector; +import org.apache.lucene.search.join.DocValuesTermsCollector.Function; +import org.apache.lucene.search.join.TermsWithScoreCollector.MV; +import org.apache.lucene.search.join.TermsWithScoreCollector.SV; +import org.apache.lucene.util.BytesRef; +import org.apache.lucene.util.BytesRefHash; interface GenericTermsCollector extends Collector { diff --git a/lucene/join/src/java/org/apache/lucene/search/join/GlobalOrdinalsCollector.java b/lucene/join/src/java/org/apache/lucene/search/join/GlobalOrdinalsCollector.java index 8a874621a79..d80851a626e 100644 --- a/lucene/join/src/java/org/apache/lucene/search/join/GlobalOrdinalsCollector.java +++ b/lucene/join/src/java/org/apache/lucene/search/join/GlobalOrdinalsCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.join; - /* * 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.lucene.search.join; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.join; import org.apache.lucene.index.DocValues; import org.apache.lucene.index.LeafReaderContext; diff --git a/lucene/join/src/java/org/apache/lucene/search/join/GlobalOrdinalsQuery.java b/lucene/join/src/java/org/apache/lucene/search/join/GlobalOrdinalsQuery.java index 03e38fe28bb..5bd8c4c8368 100644 --- a/lucene/join/src/java/org/apache/lucene/search/join/GlobalOrdinalsQuery.java +++ b/lucene/join/src/java/org/apache/lucene/search/join/GlobalOrdinalsQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.join; - /* * 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.lucene.search.join; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.join; import java.io.IOException; import java.util.Set; diff --git a/lucene/join/src/java/org/apache/lucene/search/join/GlobalOrdinalsWithScoreCollector.java b/lucene/join/src/java/org/apache/lucene/search/join/GlobalOrdinalsWithScoreCollector.java index b02d6e59dfd..57a8442372e 100644 --- a/lucene/join/src/java/org/apache/lucene/search/join/GlobalOrdinalsWithScoreCollector.java +++ b/lucene/join/src/java/org/apache/lucene/search/join/GlobalOrdinalsWithScoreCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.join; - /* * 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.lucene.search.join; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.join; import org.apache.lucene.index.DocValues; import org.apache.lucene.index.LeafReaderContext; diff --git a/lucene/join/src/java/org/apache/lucene/search/join/GlobalOrdinalsWithScoreQuery.java b/lucene/join/src/java/org/apache/lucene/search/join/GlobalOrdinalsWithScoreQuery.java index 7e8d16aea26..a85dfa33fb4 100644 --- a/lucene/join/src/java/org/apache/lucene/search/join/GlobalOrdinalsWithScoreQuery.java +++ b/lucene/join/src/java/org/apache/lucene/search/join/GlobalOrdinalsWithScoreQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.join; - /* * 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.lucene.search.join; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.join; import org.apache.lucene.index.DocValues; import org.apache.lucene.index.IndexReader; diff --git a/lucene/join/src/java/org/apache/lucene/search/join/JoinUtil.java b/lucene/join/src/java/org/apache/lucene/search/join/JoinUtil.java index c36591b396c..11a44a57dd0 100644 --- a/lucene/join/src/java/org/apache/lucene/search/join/JoinUtil.java +++ b/lucene/join/src/java/org/apache/lucene/search/join/JoinUtil.java @@ -1,12 +1,3 @@ -package org.apache.lucene.search.join; - -import java.io.IOException; -import java.util.Locale; - -import org.apache.lucene.document.FieldType.LegacyNumericType; -import org.apache.lucene.index.BinaryDocValues; -import org.apache.lucene.index.DocValuesType; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -23,6 +14,14 @@ import org.apache.lucene.index.DocValuesType; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.join; + +import java.io.IOException; +import java.util.Locale; + +import org.apache.lucene.document.FieldType.LegacyNumericType; +import org.apache.lucene.index.BinaryDocValues; +import org.apache.lucene.index.DocValuesType; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.LeafReader; diff --git a/lucene/join/src/java/org/apache/lucene/search/join/QueryBitSetProducer.java b/lucene/join/src/java/org/apache/lucene/search/join/QueryBitSetProducer.java index 70c3e965635..98d85cd0417 100644 --- a/lucene/join/src/java/org/apache/lucene/search/join/QueryBitSetProducer.java +++ b/lucene/join/src/java/org/apache/lucene/search/join/QueryBitSetProducer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.join; - /* * 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.lucene.search.join; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.join; import java.io.IOException; import java.util.Collections; diff --git a/lucene/join/src/java/org/apache/lucene/search/join/ScoreMode.java b/lucene/join/src/java/org/apache/lucene/search/join/ScoreMode.java index dd4f89a0d8b..35dff8d2bcb 100644 --- a/lucene/join/src/java/org/apache/lucene/search/join/ScoreMode.java +++ b/lucene/join/src/java/org/apache/lucene/search/join/ScoreMode.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.join; - /* * 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.lucene.search.join; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.join; /** * How to aggregate multiple child hit scores into a single parent score. diff --git a/lucene/join/src/java/org/apache/lucene/search/join/TermsCollector.java b/lucene/join/src/java/org/apache/lucene/search/join/TermsCollector.java index ea8208a146c..f2b3d42918a 100644 --- a/lucene/join/src/java/org/apache/lucene/search/join/TermsCollector.java +++ b/lucene/join/src/java/org/apache/lucene/search/join/TermsCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.join; - /* * 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.lucene.search.join; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.join; import java.io.IOException; diff --git a/lucene/join/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java b/lucene/join/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java index 3490d06821c..7c03103445b 100644 --- a/lucene/join/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java +++ b/lucene/join/src/java/org/apache/lucene/search/join/TermsIncludingScoreQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.join; - /* * 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.lucene.search.join; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.join; import java.io.IOException; import java.io.PrintStream; diff --git a/lucene/join/src/java/org/apache/lucene/search/join/TermsQuery.java b/lucene/join/src/java/org/apache/lucene/search/join/TermsQuery.java index f46b0ba4e17..eabc72a94d0 100644 --- a/lucene/join/src/java/org/apache/lucene/search/join/TermsQuery.java +++ b/lucene/join/src/java/org/apache/lucene/search/join/TermsQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.join; - /* * 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.lucene.search.join; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.join; import org.apache.lucene.index.FilteredTermsEnum; import org.apache.lucene.index.Terms; diff --git a/lucene/join/src/java/org/apache/lucene/search/join/TermsWithScoreCollector.java b/lucene/join/src/java/org/apache/lucene/search/join/TermsWithScoreCollector.java index 61ba8b14b77..a11dcecbfeb 100644 --- a/lucene/join/src/java/org/apache/lucene/search/join/TermsWithScoreCollector.java +++ b/lucene/join/src/java/org/apache/lucene/search/join/TermsWithScoreCollector.java @@ -1,8 +1,3 @@ -package org.apache.lucene.search.join; - -import java.io.IOException; -import java.util.Arrays; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -19,6 +14,10 @@ import java.util.Arrays; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.join; + +import java.io.IOException; +import java.util.Arrays; import org.apache.lucene.index.BinaryDocValues; import org.apache.lucene.index.SortedSetDocValues; diff --git a/lucene/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java b/lucene/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java index 7d42d3f76a9..d381caeaa6e 100644 --- a/lucene/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java +++ b/lucene/join/src/java/org/apache/lucene/search/join/ToChildBlockJoinQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.join; - /* * 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.lucene.search.join; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.join; import java.io.IOException; import java.util.Collection; diff --git a/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinCollector.java b/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinCollector.java index 1b5c48d1515..94b3e71696b 100644 --- a/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinCollector.java +++ b/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.join; - /* * 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.lucene.search.join; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.join; import java.io.IOException; import java.util.Arrays; diff --git a/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinIndexSearcher.java b/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinIndexSearcher.java index 18ff748ee6a..84a02a38214 100644 --- a/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinIndexSearcher.java +++ b/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinIndexSearcher.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.join; - /* * 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.lucene.search.join; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.join; import java.io.IOException; import java.util.List; diff --git a/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java b/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java index b6f41b25751..f004fde9735 100644 --- a/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java +++ b/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.join; - /* * 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.lucene.search.join; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.join; import java.io.IOException; import java.util.Collection; diff --git a/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinSortField.java b/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinSortField.java index 5623c6ec1d9..183b7dd5fb4 100644 --- a/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinSortField.java +++ b/lucene/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinSortField.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.join; - /* * 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.lucene.search.join; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.join; import org.apache.lucene.index.DocValues; import org.apache.lucene.index.LeafReaderContext; diff --git a/lucene/join/src/java/org/apache/lucene/search/join/package-info.java b/lucene/join/src/java/org/apache/lucene/search/join/package-info.java index 6133f99748f..6b22185491a 100644 --- a/lucene/join/src/java/org/apache/lucene/search/join/package-info.java +++ b/lucene/join/src/java/org/apache/lucene/search/join/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Support for index-time and query-time joins. *

Index-time joins

diff --git a/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java b/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java index c4f6626ec76..35b75a65b00 100644 --- a/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java +++ b/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.join; - /* * 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.lucene.search.join; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.join; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinSelector.java b/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinSelector.java index ff240cc7b36..c4cdc3b2f68 100644 --- a/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinSelector.java +++ b/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinSelector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.join; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,7 +14,7 @@ package org.apache.lucene.search.join; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.search.join; import java.util.Arrays; diff --git a/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinSorting.java b/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinSorting.java index 27ff1b32a2e..8b2a0bd78e7 100644 --- a/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinSorting.java +++ b/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinSorting.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.join; - /* * 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.lucene.search.join; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.join; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; diff --git a/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinValidation.java b/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinValidation.java index 5b50e6f8676..423188d64ca 100644 --- a/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinValidation.java +++ b/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoinValidation.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.join; - /* * 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.lucene.search.join; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.join; import java.util.ArrayList; import java.util.List; diff --git a/lucene/join/src/test/org/apache/lucene/search/join/TestCheckJoinIndex.java b/lucene/join/src/test/org/apache/lucene/search/join/TestCheckJoinIndex.java index 214c103b8f7..5fa4c171df9 100644 --- a/lucene/join/src/test/org/apache/lucene/search/join/TestCheckJoinIndex.java +++ b/lucene/join/src/test/org/apache/lucene/search/join/TestCheckJoinIndex.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.join; - /* * 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.lucene.search.join; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.join; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java b/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java index 816a8fc8cef..44fd40133f4 100644 --- a/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java +++ b/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java @@ -1,3 +1,19 @@ +/* + * 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; @@ -77,23 +93,6 @@ import org.apache.lucene.util.TestUtil; import org.apache.lucene.util.packed.PackedInts; import org.junit.Test; -/* - * 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. - */ - import com.carrotsearch.randomizedtesting.generators.RandomInts; import com.carrotsearch.randomizedtesting.generators.RandomPicks; diff --git a/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java b/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java index e5e461b871c..5003ec52818 100644 --- a/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java +++ b/lucene/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java @@ -1,5 +1,3 @@ -package org.apache.lucene.index.memory; - /* * 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.lucene.index.memory; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index.memory; import java.io.IOException; import java.util.Collection; diff --git a/lucene/memory/src/java/org/apache/lucene/index/memory/package-info.java b/lucene/memory/src/java/org/apache/lucene/index/memory/package-info.java index c0a17d60ef2..f606a547949 100644 --- a/lucene/memory/src/java/org/apache/lucene/index/memory/package-info.java +++ b/lucene/memory/src/java/org/apache/lucene/index/memory/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * High-performance single-document main memory Apache Lucene fulltext search index. */ diff --git a/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndex.java b/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndex.java index 6f889048e57..c8b352af958 100644 --- a/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndex.java +++ b/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndex.java @@ -1,5 +1,3 @@ -package org.apache.lucene.index.memory; - /* * 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.lucene.index.memory; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index.memory; import java.io.IOException; diff --git a/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndexAgainstRAMDir.java b/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndexAgainstRAMDir.java index bbdfb0951d5..e29e8c805e5 100644 --- a/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndexAgainstRAMDir.java +++ b/lucene/memory/src/test/org/apache/lucene/index/memory/TestMemoryIndexAgainstRAMDir.java @@ -1,5 +1,3 @@ -package org.apache.lucene.index.memory; - /* * 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.lucene.index.memory; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index.memory; import java.io.BufferedReader; import java.io.IOException; diff --git a/lucene/misc/src/java/org/apache/lucene/document/LazyDocument.java b/lucene/misc/src/java/org/apache/lucene/document/LazyDocument.java index be8e07dc1a1..c1683a75010 100644 --- a/lucene/misc/src/java/org/apache/lucene/document/LazyDocument.java +++ b/lucene/misc/src/java/org/apache/lucene/document/LazyDocument.java @@ -1,11 +1,10 @@ -package org.apache.lucene.document; - /* - * Copyright 2004 The Apache Software Foundation - * - * Licensed 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 + * 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 * @@ -15,6 +14,8 @@ package org.apache.lucene.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.document; + import java.io.IOException; import java.io.Reader; import java.util.ArrayList; diff --git a/lucene/misc/src/java/org/apache/lucene/index/MergeReaderWrapper.java b/lucene/misc/src/java/org/apache/lucene/index/MergeReaderWrapper.java index 3059650712f..dba5c913f00 100644 --- a/lucene/misc/src/java/org/apache/lucene/index/MergeReaderWrapper.java +++ b/lucene/misc/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 @@ -16,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import java.io.IOException; diff --git a/lucene/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java b/lucene/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java index 13632fe651f..94c700311b7 100644 --- a/lucene/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java +++ b/lucene/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.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 @@ -16,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import java.io.IOException; import java.nio.file.Files; diff --git a/lucene/misc/src/java/org/apache/lucene/index/PKIndexSplitter.java b/lucene/misc/src/java/org/apache/lucene/index/PKIndexSplitter.java index e2b81383de9..49ec6a28520 100644 --- a/lucene/misc/src/java/org/apache/lucene/index/PKIndexSplitter.java +++ b/lucene/misc/src/java/org/apache/lucene/index/PKIndexSplitter.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 @@ -16,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import java.io.IOException; import java.util.List; diff --git a/lucene/misc/src/java/org/apache/lucene/index/Sorter.java b/lucene/misc/src/java/org/apache/lucene/index/Sorter.java index e99e8ee4a6a..7e4e475a248 100644 --- a/lucene/misc/src/java/org/apache/lucene/index/Sorter.java +++ b/lucene/misc/src/java/org/apache/lucene/index/Sorter.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 @@ -16,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import java.io.IOException; import java.util.Comparator; diff --git a/lucene/misc/src/java/org/apache/lucene/index/SortingLeafReader.java b/lucene/misc/src/java/org/apache/lucene/index/SortingLeafReader.java index 876fa815885..12cee2096b4 100644 --- a/lucene/misc/src/java/org/apache/lucene/index/SortingLeafReader.java +++ b/lucene/misc/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 @@ -16,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import java.io.IOException; import java.util.Arrays; diff --git a/lucene/misc/src/java/org/apache/lucene/index/SortingMergePolicy.java b/lucene/misc/src/java/org/apache/lucene/index/SortingMergePolicy.java index 13797ef5001..94dd15d7ff0 100644 --- a/lucene/misc/src/java/org/apache/lucene/index/SortingMergePolicy.java +++ b/lucene/misc/src/java/org/apache/lucene/index/SortingMergePolicy.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 @@ -16,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/misc/src/java/org/apache/lucene/misc/GetTermInfo.java b/lucene/misc/src/java/org/apache/lucene/misc/GetTermInfo.java index 6bd9a4b6f17..829f3ed4e72 100644 --- a/lucene/misc/src/java/org/apache/lucene/misc/GetTermInfo.java +++ b/lucene/misc/src/java/org/apache/lucene/misc/GetTermInfo.java @@ -1,5 +1,3 @@ -package org.apache.lucene.misc; - /* * 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.lucene.misc; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.misc; import java.nio.file.Paths; import java.util.Locale; diff --git a/lucene/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java b/lucene/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java index 7332a375ccf..01a2d9dcef3 100644 --- a/lucene/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java +++ b/lucene/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java @@ -1,5 +1,3 @@ -package org.apache.lucene.misc; - /* * 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.lucene.misc; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.misc; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; diff --git a/lucene/misc/src/java/org/apache/lucene/misc/IndexMergeTool.java b/lucene/misc/src/java/org/apache/lucene/misc/IndexMergeTool.java index c0d17dea96f..a63c16b1a11 100644 --- a/lucene/misc/src/java/org/apache/lucene/misc/IndexMergeTool.java +++ b/lucene/misc/src/java/org/apache/lucene/misc/IndexMergeTool.java @@ -1,11 +1,10 @@ -package org.apache.lucene.misc; - /* - * Copyright 2005 The Apache Software Foundation - * - * Licensed 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 + * 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 * @@ -15,6 +14,7 @@ package org.apache.lucene.misc; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.misc; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; diff --git a/lucene/misc/src/java/org/apache/lucene/misc/SweetSpotSimilarity.java b/lucene/misc/src/java/org/apache/lucene/misc/SweetSpotSimilarity.java index 5c9e8b6f7d5..ce26080e45c 100644 --- a/lucene/misc/src/java/org/apache/lucene/misc/SweetSpotSimilarity.java +++ b/lucene/misc/src/java/org/apache/lucene/misc/SweetSpotSimilarity.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.misc; import org.apache.lucene.search.similarities.ClassicSimilarity; diff --git a/lucene/misc/src/java/org/apache/lucene/misc/TermStats.java b/lucene/misc/src/java/org/apache/lucene/misc/TermStats.java index 1c38f1d4ffb..5c4f5698ba1 100644 --- a/lucene/misc/src/java/org/apache/lucene/misc/TermStats.java +++ b/lucene/misc/src/java/org/apache/lucene/misc/TermStats.java @@ -1,5 +1,3 @@ -package org.apache.lucene.misc; - /* * 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.lucene.misc; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.misc; import org.apache.lucene.util.BytesRef; diff --git a/lucene/misc/src/java/org/apache/lucene/misc/package-info.java b/lucene/misc/src/java/org/apache/lucene/misc/package-info.java index 6067a6e54aa..94a21335572 100644 --- a/lucene/misc/src/java/org/apache/lucene/misc/package-info.java +++ b/lucene/misc/src/java/org/apache/lucene/misc/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Miscellaneous index tools. */ diff --git a/lucene/misc/src/java/org/apache/lucene/search/BlockJoinComparatorSource.java b/lucene/misc/src/java/org/apache/lucene/search/BlockJoinComparatorSource.java index ac0bf97e4f7..03a2cb8ee78 100644 --- a/lucene/misc/src/java/org/apache/lucene/search/BlockJoinComparatorSource.java +++ b/lucene/misc/src/java/org/apache/lucene/search/BlockJoinComparatorSource.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import java.io.IOException; diff --git a/lucene/misc/src/java/org/apache/lucene/search/DiversifiedTopDocsCollector.java b/lucene/misc/src/java/org/apache/lucene/search/DiversifiedTopDocsCollector.java index 0406577d43a..f2016cc7b71 100644 --- a/lucene/misc/src/java/org/apache/lucene/search/DiversifiedTopDocsCollector.java +++ b/lucene/misc/src/java/org/apache/lucene/search/DiversifiedTopDocsCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; + import java.io.IOException; import java.util.HashMap; import java.util.Map; diff --git a/lucene/misc/src/java/org/apache/lucene/search/EarlyTerminatingSortingCollector.java b/lucene/misc/src/java/org/apache/lucene/search/EarlyTerminatingSortingCollector.java index 8a963c059e0..5d82be41450 100644 --- a/lucene/misc/src/java/org/apache/lucene/search/EarlyTerminatingSortingCollector.java +++ b/lucene/misc/src/java/org/apache/lucene/search/EarlyTerminatingSortingCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import java.io.IOException; import java.util.Arrays; diff --git a/lucene/misc/src/java/org/apache/lucene/store/NativePosixUtil.java b/lucene/misc/src/java/org/apache/lucene/store/NativePosixUtil.java index 0618318e4bc..6397ec70291 100644 --- a/lucene/misc/src/java/org/apache/lucene/store/NativePosixUtil.java +++ b/lucene/misc/src/java/org/apache/lucene/store/NativePosixUtil.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 @@ -16,6 +14,7 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; import java.io.IOException; import java.io.FileDescriptor; diff --git a/lucene/misc/src/java/org/apache/lucene/store/NativeUnixDirectory.java b/lucene/misc/src/java/org/apache/lucene/store/NativeUnixDirectory.java index 51d7e92aa28..a0e39c06d9c 100644 --- a/lucene/misc/src/java/org/apache/lucene/store/NativeUnixDirectory.java +++ b/lucene/misc/src/java/org/apache/lucene/store/NativeUnixDirectory.java @@ -1,21 +1,20 @@ -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 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 - * + * 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. + * 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.store; import java.io.EOFException; import java.io.FileDescriptor; diff --git a/lucene/misc/src/java/org/apache/lucene/store/RAFDirectory.java b/lucene/misc/src/java/org/apache/lucene/store/RAFDirectory.java index 94be104fd4d..b1218159c78 100644 --- a/lucene/misc/src/java/org/apache/lucene/store/RAFDirectory.java +++ b/lucene/misc/src/java/org/apache/lucene/store/RAFDirectory.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 @@ -16,6 +14,7 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; import java.io.EOFException; import java.io.File; diff --git a/lucene/misc/src/java/org/apache/lucene/store/WindowsDirectory.java b/lucene/misc/src/java/org/apache/lucene/store/WindowsDirectory.java index dd8cb6cb6d0..d38539975bc 100644 --- a/lucene/misc/src/java/org/apache/lucene/store/WindowsDirectory.java +++ b/lucene/misc/src/java/org/apache/lucene/store/WindowsDirectory.java @@ -1,21 +1,20 @@ -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 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 - * + * 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. + * 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.store; import java.io.IOException; import java.io.EOFException; diff --git a/lucene/misc/src/java/org/apache/lucene/uninverting/DocTermOrds.java b/lucene/misc/src/java/org/apache/lucene/uninverting/DocTermOrds.java index 07c5a95f72e..6ef09ce2da1 100644 --- a/lucene/misc/src/java/org/apache/lucene/uninverting/DocTermOrds.java +++ b/lucene/misc/src/java/org/apache/lucene/uninverting/DocTermOrds.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.uninverting; import java.io.IOException; diff --git a/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCache.java b/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCache.java index 8647da25115..314d6aa011c 100644 --- a/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCache.java +++ b/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCache.java @@ -1,5 +1,3 @@ -package org.apache.lucene.uninverting; - /* * 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.lucene.uninverting; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.uninverting; import java.io.IOException; import java.io.PrintStream; diff --git a/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java b/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java index 85c1bbadba6..94e53bdfcf2 100644 --- a/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java +++ b/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java @@ -1,5 +1,3 @@ -package org.apache.lucene.uninverting; - /* * 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.lucene.uninverting; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.uninverting; import java.io.IOException; import java.io.PrintStream; diff --git a/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheSanityChecker.java b/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheSanityChecker.java index 75d3ce941af..e41857e8e30 100644 --- a/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheSanityChecker.java +++ b/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheSanityChecker.java @@ -1,10 +1,10 @@ -package org.apache.lucene.uninverting; /* - * Copyright 2009 The Apache Software Foundation - * - * Licensed 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 + * 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 * @@ -14,6 +14,7 @@ package org.apache.lucene.uninverting; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.uninverting; import java.util.ArrayList; import java.util.Collection; diff --git a/lucene/misc/src/java/org/apache/lucene/uninverting/UninvertingReader.java b/lucene/misc/src/java/org/apache/lucene/uninverting/UninvertingReader.java index b269a02fa0e..9f96b4f7744 100644 --- a/lucene/misc/src/java/org/apache/lucene/uninverting/UninvertingReader.java +++ b/lucene/misc/src/java/org/apache/lucene/uninverting/UninvertingReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.uninverting; - /* * 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.lucene.uninverting; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.uninverting; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/misc/src/java/org/apache/lucene/uninverting/package-info.java b/lucene/misc/src/java/org/apache/lucene/uninverting/package-info.java index a4e8521d04a..73dddcf2816 100644 --- a/lucene/misc/src/java/org/apache/lucene/uninverting/package-info.java +++ b/lucene/misc/src/java/org/apache/lucene/uninverting/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Support for creating docvalues on-the-fly from the inverted index at runtime. */ diff --git a/lucene/misc/src/java/org/apache/lucene/util/fst/ListOfOutputs.java b/lucene/misc/src/java/org/apache/lucene/util/fst/ListOfOutputs.java index a8a72491b51..aa08344646b 100644 --- a/lucene/misc/src/java/org/apache/lucene/util/fst/ListOfOutputs.java +++ b/lucene/misc/src/java/org/apache/lucene/util/fst/ListOfOutputs.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.fst; - /* * 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.lucene.util.fst; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.fst; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/misc/src/java/org/apache/lucene/util/fst/UpToTwoPositiveIntOutputs.java b/lucene/misc/src/java/org/apache/lucene/util/fst/UpToTwoPositiveIntOutputs.java index e2fb5984d3b..3d540365c44 100644 --- a/lucene/misc/src/java/org/apache/lucene/util/fst/UpToTwoPositiveIntOutputs.java +++ b/lucene/misc/src/java/org/apache/lucene/util/fst/UpToTwoPositiveIntOutputs.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.fst; - /* * 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.lucene.util.fst; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.fst; import java.io.IOException; diff --git a/lucene/misc/src/test/org/apache/lucene/index/IndexSortingTest.java b/lucene/misc/src/test/org/apache/lucene/index/IndexSortingTest.java index ac95fc6908f..8b384f41db1 100644 --- a/lucene/misc/src/test/org/apache/lucene/index/IndexSortingTest.java +++ b/lucene/misc/src/test/org/apache/lucene/index/IndexSortingTest.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 @@ -16,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import java.util.ArrayList; import java.util.Collections; diff --git a/lucene/misc/src/test/org/apache/lucene/index/SorterTestBase.java b/lucene/misc/src/test/org/apache/lucene/index/SorterTestBase.java index 3c9ff5ef0c5..93caa7016b8 100644 --- a/lucene/misc/src/test/org/apache/lucene/index/SorterTestBase.java +++ b/lucene/misc/src/test/org/apache/lucene/index/SorterTestBase.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 @@ -16,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/misc/src/test/org/apache/lucene/index/SortingLeafReaderTest.java b/lucene/misc/src/test/org/apache/lucene/index/SortingLeafReaderTest.java index 61733767520..6052ab53f1e 100644 --- a/lucene/misc/src/test/org/apache/lucene/index/SortingLeafReaderTest.java +++ b/lucene/misc/src/test/org/apache/lucene/index/SortingLeafReaderTest.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 @@ -16,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import java.util.Arrays; diff --git a/lucene/misc/src/test/org/apache/lucene/index/TestBlockJoinSorter.java b/lucene/misc/src/test/org/apache/lucene/index/TestBlockJoinSorter.java index 7c281b0934d..4a0d2b5a594 100644 --- a/lucene/misc/src/test/org/apache/lucene/index/TestBlockJoinSorter.java +++ b/lucene/misc/src/test/org/apache/lucene/index/TestBlockJoinSorter.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 @@ -16,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java b/lucene/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java index 5b87bf8ac48..a83fe836476 100644 --- a/lucene/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.java +++ b/lucene/misc/src/test/org/apache/lucene/index/TestMultiPassIndexSplitter.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 @@ -16,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; diff --git a/lucene/misc/src/test/org/apache/lucene/index/TestPKIndexSplitter.java b/lucene/misc/src/test/org/apache/lucene/index/TestPKIndexSplitter.java index b6157643a0c..931c20434ea 100644 --- a/lucene/misc/src/test/org/apache/lucene/index/TestPKIndexSplitter.java +++ b/lucene/misc/src/test/org/apache/lucene/index/TestPKIndexSplitter.java @@ -1,21 +1,20 @@ -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 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 - * + * 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. + * 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.index; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; diff --git a/lucene/misc/src/test/org/apache/lucene/index/TestSortingMergePolicy.java b/lucene/misc/src/test/org/apache/lucene/index/TestSortingMergePolicy.java index 9a76fad5c64..c763c6902b3 100644 --- a/lucene/misc/src/test/org/apache/lucene/index/TestSortingMergePolicy.java +++ b/lucene/misc/src/test/org/apache/lucene/index/TestSortingMergePolicy.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 @@ -16,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import java.io.IOException; import java.lang.reflect.Method; diff --git a/lucene/misc/src/test/org/apache/lucene/misc/SweetSpotSimilarityTest.java b/lucene/misc/src/test/org/apache/lucene/misc/SweetSpotSimilarityTest.java index d42e63fb4fb..b618654b7e1 100644 --- a/lucene/misc/src/test/org/apache/lucene/misc/SweetSpotSimilarityTest.java +++ b/lucene/misc/src/test/org/apache/lucene/misc/SweetSpotSimilarityTest.java @@ -1,4 +1,3 @@ - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.misc; import org.apache.lucene.search.similarities.ClassicSimilarity; @@ -25,7 +23,6 @@ import org.apache.lucene.search.similarities.TFIDFSimilarity; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.index.FieldInvertState; - /** * Test of the SweetSpotSimilarity */ diff --git a/lucene/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java b/lucene/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java index fcc9fe7a63e..fba52709c49 100644 --- a/lucene/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java +++ b/lucene/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java @@ -1,5 +1,3 @@ -package org.apache.lucene.misc; - /* * 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.lucene.misc; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.misc; import java.util.Random; diff --git a/lucene/misc/src/test/org/apache/lucene/search/TestDiversifiedTopDocsCollector.java b/lucene/misc/src/test/org/apache/lucene/search/TestDiversifiedTopDocsCollector.java index 8919c50c572..3fbe14a4217 100644 --- a/lucene/misc/src/test/org/apache/lucene/search/TestDiversifiedTopDocsCollector.java +++ b/lucene/misc/src/test/org/apache/lucene/search/TestDiversifiedTopDocsCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import java.io.IOException; import java.util.HashMap; diff --git a/lucene/misc/src/test/org/apache/lucene/search/TestEarlyTerminatingSortingCollector.java b/lucene/misc/src/test/org/apache/lucene/search/TestEarlyTerminatingSortingCollector.java index 95844ff3901..14bd43714fb 100644 --- a/lucene/misc/src/test/org/apache/lucene/search/TestEarlyTerminatingSortingCollector.java +++ b/lucene/misc/src/test/org/apache/lucene/search/TestEarlyTerminatingSortingCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/misc/src/test/org/apache/lucene/store/TestRAFDirectory.java b/lucene/misc/src/test/org/apache/lucene/store/TestRAFDirectory.java index db84b43ea13..5a2981fe378 100644 --- a/lucene/misc/src/test/org/apache/lucene/store/TestRAFDirectory.java +++ b/lucene/misc/src/test/org/apache/lucene/store/TestRAFDirectory.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 @@ -16,6 +14,7 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; import java.io.IOException; import java.nio.file.Path; diff --git a/lucene/misc/src/test/org/apache/lucene/uninverting/TestDocTermOrds.java b/lucene/misc/src/test/org/apache/lucene/uninverting/TestDocTermOrds.java index dcf768e6b71..8c1fae7b646 100644 --- a/lucene/misc/src/test/org/apache/lucene/uninverting/TestDocTermOrds.java +++ b/lucene/misc/src/test/org/apache/lucene/uninverting/TestDocTermOrds.java @@ -1,5 +1,3 @@ -package org.apache.lucene.uninverting; - /* * 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.lucene.uninverting; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.uninverting; import java.io.IOException; import java.util.Arrays; diff --git a/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCache.java b/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCache.java index 64f2f9d9a01..215e9a353e7 100644 --- a/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCache.java +++ b/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCache.java @@ -1,11 +1,10 @@ -package org.apache.lucene.uninverting; - /* - * Copyright 2004 The Apache Software Foundation - * - * Licensed 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 + * 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 * @@ -15,6 +14,7 @@ package org.apache.lucene.uninverting; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.uninverting; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheReopen.java b/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheReopen.java index c10ec13d359..a85731ff4d0 100644 --- a/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheReopen.java +++ b/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheReopen.java @@ -1,5 +1,3 @@ -package org.apache.lucene.uninverting; - /* * 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.lucene.uninverting; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.uninverting; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; diff --git a/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSanityChecker.java b/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSanityChecker.java index b6e83df0dac..f7dc0489ca7 100644 --- a/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSanityChecker.java +++ b/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSanityChecker.java @@ -1,11 +1,10 @@ -package org.apache.lucene.uninverting; - /* - * Copyright 2009 The Apache Software Foundation - * - * Licensed 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 + * 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 * @@ -15,6 +14,7 @@ package org.apache.lucene.uninverting; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.uninverting; import java.io.IOException; diff --git a/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSort.java b/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSort.java index e2f669d4ad3..55d6714b1ad 100644 --- a/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSort.java +++ b/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSort.java @@ -1,5 +1,3 @@ -package org.apache.lucene.uninverting; - /* * 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.lucene.uninverting; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.uninverting; import java.io.IOException; import java.util.Collections; diff --git a/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSortRandom.java b/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSortRandom.java index a6961c848e7..0b6292d3c65 100644 --- a/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSortRandom.java +++ b/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheSortRandom.java @@ -1,5 +1,3 @@ -package org.apache.lucene.uninverting; - /* * 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.lucene.uninverting; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.uninverting; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheVsDocValues.java b/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheVsDocValues.java index 6223ff74d82..1b1452289cc 100644 --- a/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheVsDocValues.java +++ b/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheVsDocValues.java @@ -1,5 +1,3 @@ -package org.apache.lucene.uninverting; - /* * 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.lucene.uninverting; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.uninverting; import static org.apache.lucene.index.SortedSetDocValues.NO_MORE_ORDS; diff --git a/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheWithThreads.java b/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheWithThreads.java index aa51b2469bb..9b05ee11201 100644 --- a/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheWithThreads.java +++ b/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheWithThreads.java @@ -1,5 +1,3 @@ -package org.apache.lucene.uninverting; - /* * 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.lucene.uninverting; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.uninverting; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/misc/src/test/org/apache/lucene/uninverting/TestNumericTerms32.java b/lucene/misc/src/test/org/apache/lucene/uninverting/TestNumericTerms32.java index 0400f5f8497..bc85db4b371 100644 --- a/lucene/misc/src/test/org/apache/lucene/uninverting/TestNumericTerms32.java +++ b/lucene/misc/src/test/org/apache/lucene/uninverting/TestNumericTerms32.java @@ -1,5 +1,3 @@ -package org.apache.lucene.uninverting; - /* * 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.lucene.uninverting; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.uninverting; import java.util.HashMap; import java.util.Map; diff --git a/lucene/misc/src/test/org/apache/lucene/uninverting/TestNumericTerms64.java b/lucene/misc/src/test/org/apache/lucene/uninverting/TestNumericTerms64.java index abc89334c27..d9fcc92eedd 100644 --- a/lucene/misc/src/test/org/apache/lucene/uninverting/TestNumericTerms64.java +++ b/lucene/misc/src/test/org/apache/lucene/uninverting/TestNumericTerms64.java @@ -1,5 +1,3 @@ -package org.apache.lucene.uninverting; - /* * 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.lucene.uninverting; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.uninverting; import java.util.HashMap; import java.util.Map; diff --git a/lucene/misc/src/test/org/apache/lucene/uninverting/TestUninvertingReader.java b/lucene/misc/src/test/org/apache/lucene/uninverting/TestUninvertingReader.java index afcd3398e95..99df329284d 100644 --- a/lucene/misc/src/test/org/apache/lucene/uninverting/TestUninvertingReader.java +++ b/lucene/misc/src/test/org/apache/lucene/uninverting/TestUninvertingReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.uninverting; - /* * 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.lucene.uninverting; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.uninverting; import java.io.IOException; import java.util.EnumSet; diff --git a/lucene/misc/src/test/org/apache/lucene/util/fst/TestFSTsMisc.java b/lucene/misc/src/test/org/apache/lucene/util/fst/TestFSTsMisc.java index 9ffa0113cb9..40ec31ef67c 100644 --- a/lucene/misc/src/test/org/apache/lucene/util/fst/TestFSTsMisc.java +++ b/lucene/misc/src/test/org/apache/lucene/util/fst/TestFSTsMisc.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.fst; - /* * 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.lucene.util.fst; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.fst; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/BoostingQuery.java b/lucene/queries/src/java/org/apache/lucene/queries/BoostingQuery.java index 914f5736aef..022d83894c3 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/BoostingQuery.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/BoostingQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queries; - /* * 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.lucene.queries; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries; import java.io.IOException; import java.util.Objects; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/CommonTermsQuery.java b/lucene/queries/src/java/org/apache/lucene/queries/CommonTermsQuery.java index 6dcae008d2f..dd902373b70 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/CommonTermsQuery.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/CommonTermsQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queries; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.queries; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries; + import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreProvider.java b/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreProvider.java index f75ce98325b..db67b9429dc 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreProvider.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreProvider.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queries; - /* * 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.lucene.queries; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java b/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java index 5703a4b58ba..ed78a03a779 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/CustomScoreQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queries; - /* * 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.lucene.queries; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries; import java.io.IOException; import java.util.Arrays; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/TermsQuery.java b/lucene/queries/src/java/org/apache/lucene/queries/TermsQuery.java index 922eca76621..ce99fc8aa1a 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/TermsQuery.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/TermsQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queries; - /* * 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.lucene.queries; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/BoostedQuery.java b/lucene/queries/src/java/org/apache/lucene/queries/function/BoostedQuery.java index ea126a28fdc..e42fe644c9e 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/BoostedQuery.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/BoostedQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queries.function; - /* * 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.lucene.queries.function; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries.function; import java.io.IOException; import java.util.Collection; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java b/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java index ce3aba320aa..6f9ecd8dd39 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queries.function; - /* * 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.lucene.queries.function; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries.function; import java.io.IOException; import java.util.Map; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionRangeQuery.java b/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionRangeQuery.java index 65b5a8b55de..0541d39c9cd 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionRangeQuery.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionRangeQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queries.function; - /* * 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.lucene.queries.function; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries.function; import java.io.IOException; import java.util.Map; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionValues.java b/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionValues.java index c88fc35054b..31ecd3dffc6 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionValues.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/FunctionValues.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queries.function; - /* * 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.lucene.queries.function; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries.function; import org.apache.lucene.index.IndexReader; import org.apache.lucene.search.Explanation; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSource.java b/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSource.java index 14cdc1d7c6a..49d4b779fae 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSource.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queries.function; - /* * 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.lucene.queries.function; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries.function; import java.io.IOException; import java.util.IdentityHashMap; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSourceScorer.java b/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSourceScorer.java index 5af4c86ee28..d05e0308a9a 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSourceScorer.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/ValueSourceScorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queries.function; - /* * 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.lucene.queries.function; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries.function; import java.io.IOException; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/docvalues/BoolDocValues.java b/lucene/queries/src/java/org/apache/lucene/queries/function/docvalues/BoolDocValues.java index 09e9e94ec70..f3066e336c1 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/docvalues/BoolDocValues.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/docvalues/BoolDocValues.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queries.function.docvalues; - /* * 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.lucene.queries.function.docvalues; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries.function.docvalues; import org.apache.lucene.queries.function.FunctionValues; import org.apache.lucene.queries.function.ValueSource; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/docvalues/DocTermsIndexDocValues.java b/lucene/queries/src/java/org/apache/lucene/queries/function/docvalues/DocTermsIndexDocValues.java index 8911828212e..4cbcd68fd78 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/docvalues/DocTermsIndexDocValues.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/docvalues/DocTermsIndexDocValues.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.queries.function.docvalues; import java.io.IOException; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/docvalues/DoubleDocValues.java b/lucene/queries/src/java/org/apache/lucene/queries/function/docvalues/DoubleDocValues.java index 996bbbc00a0..1cb691fc901 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/docvalues/DoubleDocValues.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/docvalues/DoubleDocValues.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queries.function.docvalues; - /* * 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.lucene.queries.function.docvalues; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries.function.docvalues; import org.apache.lucene.index.IndexReader; import org.apache.lucene.queries.function.FunctionValues; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/docvalues/FloatDocValues.java b/lucene/queries/src/java/org/apache/lucene/queries/function/docvalues/FloatDocValues.java index 5e975a740df..79149cb1817 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/docvalues/FloatDocValues.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/docvalues/FloatDocValues.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queries.function.docvalues; - /* * 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.lucene.queries.function.docvalues; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries.function.docvalues; import org.apache.lucene.queries.function.FunctionValues; import org.apache.lucene.queries.function.ValueSource; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/docvalues/IntDocValues.java b/lucene/queries/src/java/org/apache/lucene/queries/function/docvalues/IntDocValues.java index ee656a2433a..d8a77e38931 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/docvalues/IntDocValues.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/docvalues/IntDocValues.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queries.function.docvalues; - /* * 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.lucene.queries.function.docvalues; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries.function.docvalues; import org.apache.lucene.index.IndexReader; import org.apache.lucene.queries.function.FunctionValues; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/docvalues/LongDocValues.java b/lucene/queries/src/java/org/apache/lucene/queries/function/docvalues/LongDocValues.java index 55bd5986b17..626b2e510f0 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/docvalues/LongDocValues.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/docvalues/LongDocValues.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queries.function.docvalues; - /* * 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.lucene.queries.function.docvalues; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries.function.docvalues; import org.apache.lucene.index.IndexReader; import org.apache.lucene.queries.function.FunctionValues; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/docvalues/StrDocValues.java b/lucene/queries/src/java/org/apache/lucene/queries/function/docvalues/StrDocValues.java index ad2e5bc530b..e6e6b69e71b 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/docvalues/StrDocValues.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/docvalues/StrDocValues.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queries.function.docvalues; - /* * 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.lucene.queries.function.docvalues; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries.function.docvalues; import org.apache.lucene.queries.function.FunctionValues; import org.apache.lucene.queries.function.ValueSource; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/docvalues/package-info.java b/lucene/queries/src/java/org/apache/lucene/queries/function/docvalues/package-info.java index da7fe26c9de..5be042a7a7a 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/docvalues/package-info.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/docvalues/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * FunctionValues for different data types. */ diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/package-info.java b/lucene/queries/src/java/org/apache/lucene/queries/function/package-info.java index cd4459053de..88403bacb1f 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/package-info.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Queries that compute score based upon a function. */ diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/BoolFunction.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/BoolFunction.java index 57c3a6c594d..e23ccdeb5d4 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/BoolFunction.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/BoolFunction.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.queries.function.valuesource; import org.apache.lucene.queries.function.ValueSource; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/BytesRefFieldSource.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/BytesRefFieldSource.java index aeda1e172cb..24a65f28859 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/BytesRefFieldSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/BytesRefFieldSource.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queries.function.valuesource; - /* * 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.lucene.queries.function.valuesource; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries.function.valuesource; import java.io.IOException; import java.util.Map; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ConstNumberSource.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ConstNumberSource.java index 511000296c2..445cdb00956 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ConstNumberSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ConstNumberSource.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.queries.function.valuesource; import org.apache.lucene.queries.function.ValueSource; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ConstValueSource.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ConstValueSource.java index 3836d6436d7..125422fb2de 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ConstValueSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ConstValueSource.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.queries.function.valuesource; import org.apache.lucene.index.LeafReaderContext; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DefFunction.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DefFunction.java index c51add44883..4880140c3b6 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DefFunction.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DefFunction.java @@ -1,4 +1,3 @@ -package org.apache.lucene.queries.function.valuesource; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.queries.function.valuesource; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.queries.function.valuesource; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.queries.function.FunctionValues; import org.apache.lucene.queries.function.ValueSource; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DivFloatFunction.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DivFloatFunction.java index cb45b5b2a6b..c90f94d4a4d 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DivFloatFunction.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DivFloatFunction.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.queries.function.valuesource; import org.apache.lucene.queries.function.FunctionValues; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DocFreqValueSource.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DocFreqValueSource.java index 8d9b7ce2272..e03e3160495 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DocFreqValueSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DocFreqValueSource.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.queries.function.valuesource; import org.apache.lucene.index.LeafReaderContext; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleConstValueSource.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleConstValueSource.java index 7ff0e5e64ff..74a47741c37 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleConstValueSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleConstValueSource.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.queries.function.valuesource; import org.apache.lucene.index.LeafReaderContext; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleFieldSource.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleFieldSource.java index cc7ae54316a..cf6f267f9c9 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleFieldSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DoubleFieldSource.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.queries.function.valuesource; import java.io.IOException; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DualFloatFunction.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DualFloatFunction.java index 35593fbb0b4..f37ca43aba3 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DualFloatFunction.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/DualFloatFunction.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.queries.function.valuesource; import org.apache.lucene.index.LeafReaderContext; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/EnumFieldSource.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/EnumFieldSource.java index 0c2289851ea..cc7df232986 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/EnumFieldSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/EnumFieldSource.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queries.function.valuesource; - /* * 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.lucene.queries.function.valuesource; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries.function.valuesource; import java.io.IOException; import java.util.Map; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/FieldCacheSource.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/FieldCacheSource.java index 0e0ee801a6f..bd9d0acc0f5 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/FieldCacheSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/FieldCacheSource.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.queries.function.valuesource; import org.apache.lucene.queries.function.ValueSource; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/FloatFieldSource.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/FloatFieldSource.java index 09410e66d70..a9a3a852c23 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/FloatFieldSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/FloatFieldSource.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.queries.function.valuesource; import java.io.IOException; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IDFValueSource.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IDFValueSource.java index ae1d39dd129..34e56975479 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IDFValueSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IDFValueSource.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.queries.function.valuesource; import org.apache.lucene.index.*; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IfFunction.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IfFunction.java index 756b4f5e87c..98bd7b4803b 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IfFunction.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IfFunction.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.queries.function.valuesource; import org.apache.lucene.index.LeafReaderContext; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java index 4e0fc9662ae..686c0165d54 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/IntFieldSource.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.queries.function.valuesource; import java.io.IOException; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java index 5ed3f3b9af8..9884c7aeb8e 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/JoinDocFreqValueSource.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.queries.function.valuesource; import java.io.IOException; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/LinearFloatFunction.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/LinearFloatFunction.java index 3b25ee58474..13682afcc03 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/LinearFloatFunction.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/LinearFloatFunction.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.queries.function.valuesource; import org.apache.lucene.index.LeafReaderContext; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/LiteralValueSource.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/LiteralValueSource.java index ab3f1d89eb9..aeb3b49a717 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/LiteralValueSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/LiteralValueSource.java @@ -1,4 +1,3 @@ -package org.apache.lucene.queries.function.valuesource; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.queries.function.valuesource; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.queries.function.valuesource; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.queries.function.FunctionValues; import org.apache.lucene.queries.function.ValueSource; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java index c3b00b6275a..e231694edb2 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/LongFieldSource.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.queries.function.valuesource; import java.io.IOException; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxFloatFunction.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxFloatFunction.java index 2ea7ea3e24d..5f7904b2d67 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxFloatFunction.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MaxFloatFunction.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.queries.function.valuesource; import org.apache.lucene.queries.function.FunctionValues; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MinFloatFunction.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MinFloatFunction.java index a3f20cdb330..4190635f5ba 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MinFloatFunction.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MinFloatFunction.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.queries.function.valuesource; import org.apache.lucene.queries.function.FunctionValues; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiBoolFunction.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiBoolFunction.java index 0f7bc2e99e8..48d61e1455f 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiBoolFunction.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiBoolFunction.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.queries.function.valuesource; import org.apache.lucene.index.LeafReaderContext; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFloatFunction.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFloatFunction.java index 53600284e32..67434b0e2aa 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFloatFunction.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFloatFunction.java @@ -1,4 +1,3 @@ -package org.apache.lucene.queries.function.valuesource; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.queries.function.valuesource; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.queries.function.valuesource; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.queries.function.FunctionValues; import org.apache.lucene.queries.function.ValueSource; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFunction.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFunction.java index 34d792e4e7b..28182f082bc 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFunction.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiFunction.java @@ -1,4 +1,3 @@ -package org.apache.lucene.queries.function.valuesource; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.queries.function.valuesource; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.queries.function.valuesource; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.queries.function.FunctionValues; import org.apache.lucene.queries.function.ValueSource; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiValueSource.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiValueSource.java index d6430c04e6a..fd3bf97b9af 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiValueSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/MultiValueSource.java @@ -1,4 +1,3 @@ -package org.apache.lucene.queries.function.valuesource; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.queries.function.valuesource; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.queries.function.valuesource; import org.apache.lucene.queries.function.ValueSource; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java index bb9e6414796..41c0a9755c3 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/NormValueSource.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.queries.function.valuesource; import org.apache.lucene.index.LeafReaderContext; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/PowFloatFunction.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/PowFloatFunction.java index 7a35c94d035..9308b929a91 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/PowFloatFunction.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/PowFloatFunction.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.queries.function.valuesource; import org.apache.lucene.queries.function.FunctionValues; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ProductFloatFunction.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ProductFloatFunction.java index 34b8271ac75..7b5734fc164 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ProductFloatFunction.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ProductFloatFunction.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.queries.function.valuesource; import org.apache.lucene.queries.function.FunctionValues; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java index 2154342dbd5..21cb70a62e2 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/QueryValueSource.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.queries.function.valuesource; import java.io.IOException; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/RangeMapFloatFunction.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/RangeMapFloatFunction.java index 210339fdb23..d902ad62060 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/RangeMapFloatFunction.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/RangeMapFloatFunction.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.queries.function.valuesource; import org.apache.lucene.index.LeafReaderContext; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ReciprocalFloatFunction.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ReciprocalFloatFunction.java index 0c33bf78855..b96699a4b17 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ReciprocalFloatFunction.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ReciprocalFloatFunction.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.queries.function.valuesource; import org.apache.lucene.index.LeafReaderContext; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ScaleFloatFunction.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ScaleFloatFunction.java index e346b946a5d..d810e9caece 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ScaleFloatFunction.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/ScaleFloatFunction.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.queries.function.valuesource; import org.apache.lucene.index.LeafReaderContext; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleBoolFunction.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleBoolFunction.java index b944b9b18b9..4135fb73a4c 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleBoolFunction.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleBoolFunction.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.queries.function.valuesource; import org.apache.lucene.index.LeafReaderContext; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleFloatFunction.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleFloatFunction.java index 050b80e2b99..364a0a44a6a 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleFloatFunction.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SimpleFloatFunction.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.queries.function.valuesource; import org.apache.lucene.index.LeafReaderContext; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SingleFunction.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SingleFunction.java index 28e3616bb9b..f7eb69900b6 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SingleFunction.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SingleFunction.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.queries.function.valuesource; import org.apache.lucene.queries.function.ValueSource; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SortedSetFieldSource.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SortedSetFieldSource.java index 67dd63a1c36..1820d74b33c 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SortedSetFieldSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SortedSetFieldSource.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queries.function.valuesource; - /* * 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.lucene.queries.function.valuesource; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries.function.valuesource; import java.io.IOException; import java.util.Map; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SumFloatFunction.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SumFloatFunction.java index 321edd030c7..b89a92d4806 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SumFloatFunction.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SumFloatFunction.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.queries.function.valuesource; import org.apache.lucene.queries.function.FunctionValues; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SumTotalTermFreqValueSource.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SumTotalTermFreqValueSource.java index 6b7a7fa2bae..9594ad9afe2 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SumTotalTermFreqValueSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SumTotalTermFreqValueSource.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.queries.function.valuesource; import org.apache.lucene.index.LeafReaderContext; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java index 9165cb203f5..f0e252c6980 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TFValueSource.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queries.function.valuesource; - /* * 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.lucene.queries.function.valuesource; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries.function.valuesource; import java.io.IOException; import java.util.Map; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java index aa95f2b83ac..789e3e9e6e3 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TermFreqValueSource.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.queries.function.valuesource; import java.io.IOException; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TotalTermFreqValueSource.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TotalTermFreqValueSource.java index 5002928c2d3..aabe45f6d8f 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TotalTermFreqValueSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/TotalTermFreqValueSource.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.queries.function.valuesource; import org.apache.lucene.index.LeafReaderContext; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/VectorValueSource.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/VectorValueSource.java index 78db6193492..d5f22fe5775 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/VectorValueSource.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/VectorValueSource.java @@ -1,4 +1,3 @@ -package org.apache.lucene.queries.function.valuesource; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.queries.function.valuesource; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.queries.function.valuesource; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.queries.function.FunctionValues; import org.apache.lucene.queries.function.ValueSource; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/package-info.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/package-info.java index e57c647cb40..64066ec140a 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/package-info.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * A variety of functions to use with FunctionQuery. */ diff --git a/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java b/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java index 61503d6dcfc..161dddb7f60 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java @@ -1,11 +1,10 @@ -package org.apache.lucene.queries.mlt; - /* - * Copyright 2004-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * @@ -15,6 +14,7 @@ package org.apache.lucene.queries.mlt; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries.mlt; import java.io.IOException; import java.io.Reader; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThisQuery.java b/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThisQuery.java index a9d17c0d62f..ecd3e60118e 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThisQuery.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThisQuery.java @@ -1,8 +1,3 @@ -/* - * Created on 25-Jan-2006 - */ -package org.apache.lucene.queries.mlt; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -19,6 +14,7 @@ package org.apache.lucene.queries.mlt; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries.mlt; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.index.IndexReader; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/mlt/package-info.java b/lucene/queries/src/java/org/apache/lucene/queries/mlt/package-info.java index e4f00a3d2e3..851ff4fccc1 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/mlt/package-info.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/mlt/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Document similarity query generators. */ diff --git a/lucene/queries/src/java/org/apache/lucene/queries/package-info.java b/lucene/queries/src/java/org/apache/lucene/queries/package-info.java index 49b22e58daf..6e00780f89c 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/package-info.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Filters and Queries that add to core Lucene. */ diff --git a/lucene/queries/src/java/org/apache/lucene/queries/payloads/AveragePayloadFunction.java b/lucene/queries/src/java/org/apache/lucene/queries/payloads/AveragePayloadFunction.java index 1b3c9d80467..92040ed7968 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/payloads/AveragePayloadFunction.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/payloads/AveragePayloadFunction.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queries.payloads; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,7 +14,7 @@ package org.apache.lucene.queries.payloads; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.queries.payloads; /** * Calculate the final score as the average score of all payloads seen. diff --git a/lucene/queries/src/java/org/apache/lucene/queries/payloads/MaxPayloadFunction.java b/lucene/queries/src/java/org/apache/lucene/queries/payloads/MaxPayloadFunction.java index ea30e6523a6..d09c25518c5 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/payloads/MaxPayloadFunction.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/payloads/MaxPayloadFunction.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queries.payloads; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,7 +14,7 @@ package org.apache.lucene.queries.payloads; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.queries.payloads; /** * Returns the maximum payload score seen, else 1 if there are no payloads on the doc. diff --git a/lucene/queries/src/java/org/apache/lucene/queries/payloads/MinPayloadFunction.java b/lucene/queries/src/java/org/apache/lucene/queries/payloads/MinPayloadFunction.java index 64ab1d190fc..56aa9572785 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/payloads/MinPayloadFunction.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/payloads/MinPayloadFunction.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queries.payloads; - /* * 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.lucene.queries.payloads; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries.payloads; /** * Calculates the minimum payload seen diff --git a/lucene/queries/src/java/org/apache/lucene/queries/payloads/PayloadFunction.java b/lucene/queries/src/java/org/apache/lucene/queries/payloads/PayloadFunction.java index fec403e66dd..afb7c7b9022 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/payloads/PayloadFunction.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/payloads/PayloadFunction.java @@ -1,4 +1,3 @@ -package org.apache.lucene.queries.payloads; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.queries.payloads; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.queries.payloads; import org.apache.lucene.search.Explanation; import org.apache.lucene.search.spans.Spans; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/payloads/PayloadScoreQuery.java b/lucene/queries/src/java/org/apache/lucene/queries/payloads/PayloadScoreQuery.java index f39a082650b..d35eb35a025 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/payloads/PayloadScoreQuery.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/payloads/PayloadScoreQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queries.payloads; - /* * 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.lucene.queries.payloads; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries.payloads; import java.io.IOException; import java.util.Map; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/payloads/SpanPayloadCheckQuery.java b/lucene/queries/src/java/org/apache/lucene/queries/payloads/SpanPayloadCheckQuery.java index 9b68487c6f9..62704b42ba8 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/payloads/SpanPayloadCheckQuery.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/payloads/SpanPayloadCheckQuery.java @@ -1,4 +1,3 @@ -package org.apache.lucene.queries.payloads; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.queries.payloads; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.queries.payloads; import java.io.IOException; import java.util.List; import java.util.Map; diff --git a/lucene/queries/src/java/org/apache/lucene/queries/payloads/package-info.java b/lucene/queries/src/java/org/apache/lucene/queries/payloads/package-info.java index 1eb61e582ee..ae24e233d85 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/payloads/package-info.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/payloads/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * The payloads package provides Query mechanisms for finding and using payloads. *

diff --git a/lucene/queries/src/test/org/apache/lucene/queries/BoostingQueryTest.java b/lucene/queries/src/test/org/apache/lucene/queries/BoostingQueryTest.java index 4e7c45d4819..939af749f04 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/BoostingQueryTest.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/BoostingQueryTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queries; - /* * 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.lucene.queries; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries; import java.io.IOException; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/CommonTermsQueryTest.java b/lucene/queries/src/test/org/apache/lucene/queries/CommonTermsQueryTest.java index 22b5b525723..640089add39 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/CommonTermsQueryTest.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/CommonTermsQueryTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queries; - /* * 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.lucene.queries; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/TermsQueryTest.java b/lucene/queries/src/test/org/apache/lucene/queries/TermsQueryTest.java index 831ccf3ad0b..7b1d4c9713f 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/TermsQueryTest.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/TermsQueryTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queries; - /* * 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.lucene.queries; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/TestCustomScoreExplanations.java b/lucene/queries/src/test/org/apache/lucene/queries/TestCustomScoreExplanations.java index b579ec925d7..fc649984523 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/TestCustomScoreExplanations.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/TestCustomScoreExplanations.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queries; - /* * 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.lucene.queries; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries; import org.apache.lucene.index.Term; import org.apache.lucene.queries.function.FunctionQuery; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java index 9df2b3cb3ee..7f667201138 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/TestCustomScoreQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queries; - /* * 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.lucene.queries; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java b/lucene/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java index cf3fa1a09cd..d5a587df61e 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java @@ -1,3 +1,19 @@ +/* + * 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.queries.function; import org.apache.lucene.analysis.Analyzer; @@ -22,22 +38,6 @@ import org.apache.lucene.util.TestUtil; import org.junit.AfterClass; import org.junit.Ignore; -/* - * 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. - */ /** * Setup for function tests */ diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/TestBoostedQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/function/TestBoostedQuery.java index a6db9f157af..a870366b93e 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/function/TestBoostedQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/function/TestBoostedQuery.java @@ -1,3 +1,19 @@ +/* + * 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.queries.function; @@ -23,23 +39,6 @@ import org.apache.lucene.util.LuceneTestCase; import org.junit.AfterClass; import org.junit.BeforeClass; -/* - * 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. - */ - /** * Basic tests for {@link BoostedQuery} */ diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/TestDocValuesFieldSources.java b/lucene/queries/src/test/org/apache/lucene/queries/function/TestDocValuesFieldSources.java index b604d7971a7..c7738e9dfd8 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/function/TestDocValuesFieldSources.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/function/TestDocValuesFieldSources.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queries.function; - /* * 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.lucene.queries.function; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries.function; import java.io.IOException; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/TestFieldScoreQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/function/TestFieldScoreQuery.java index 08af9c1d786..843f4525acc 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/function/TestFieldScoreQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/function/TestFieldScoreQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queries.function; - /* * 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.lucene.queries.function; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries.function; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQueryExplanations.java b/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQueryExplanations.java index 7dbe30faf14..56ea4910b78 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQueryExplanations.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQueryExplanations.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queries.function; - /* * 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.lucene.queries.function; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries.function; import org.apache.lucene.queries.function.valuesource.ConstValueSource; import org.apache.lucene.queries.function.valuesource.RangeMapFloatFunction; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQuerySort.java b/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQuerySort.java index 9297733c0bb..b9e1eb2cade 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQuerySort.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQuerySort.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queries.function; - /* * 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.lucene.queries.function; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries.function; import java.io.IOException; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionRangeQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionRangeQuery.java index 92a2c4c21a5..5f3a412155c 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionRangeQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionRangeQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queries.function; - /* * 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.lucene.queries.function; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries.function; import java.io.IOException; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/TestLongNormValueSource.java b/lucene/queries/src/test/org/apache/lucene/queries/function/TestLongNormValueSource.java index c2c1dff4fa6..9681f77b58c 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/function/TestLongNormValueSource.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/function/TestLongNormValueSource.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queries.function; - /* * 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.lucene.queries.function; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries.function; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.MockAnalyzer; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/TestSortedSetFieldSource.java b/lucene/queries/src/test/org/apache/lucene/queries/function/TestSortedSetFieldSource.java index af5d58cd20b..d028dce6db4 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/function/TestSortedSetFieldSource.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/function/TestSortedSetFieldSource.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queries.function; - /* * 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.lucene.queries.function; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries.function; import java.util.Collections; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java b/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java index 1b00fd395e9..37a32da5db6 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queries.function; - /* * 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.lucene.queries.function; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries.function; import java.util.Arrays; import java.util.List; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java b/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java index 4690dc74c4d..6eb42662c62 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queries.mlt; - /* * 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.lucene.queries.mlt; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries.mlt; import java.io.IOException; import java.io.StringReader; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/payloads/PayloadHelper.java b/lucene/queries/src/test/org/apache/lucene/queries/payloads/PayloadHelper.java index e7d883c2436..484c1bd4f64 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/payloads/PayloadHelper.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/payloads/PayloadHelper.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queries.payloads; - /* * 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.lucene.queries.payloads; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries.payloads; import org.apache.lucene.analysis.*; import org.apache.lucene.analysis.tokenattributes.PayloadAttribute; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadCheckQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadCheckQuery.java index 21ca7fe16f8..7067ef201f1 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadCheckQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadCheckQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queries.payloads; - /* * 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.lucene.queries.payloads; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries.payloads; import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadExplanations.java b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadExplanations.java index b8950d9b607..f5ac15f9c28 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadExplanations.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadExplanations.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queries.payloads; - /* * 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.lucene.queries.payloads; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries.payloads; import org.apache.lucene.index.Term; import org.apache.lucene.search.BaseExplanationTestCase; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadScoreQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadScoreQuery.java index 2ccd26c4b7b..043e969aa57 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadScoreQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadScoreQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queries.payloads; - /* * 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.lucene.queries.payloads; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries.payloads; import java.io.IOException; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpans.java b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpans.java index cef01be9dc3..3f168bba4af 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpans.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadSpans.java @@ -1,11 +1,10 @@ -package org.apache.lucene.queries.payloads; - /* - * Copyright 2004 The Apache Software Foundation - * - * Licensed 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 + * 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 * @@ -15,6 +14,7 @@ package org.apache.lucene.queries.payloads; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queries.payloads; import java.io.IOException; import java.io.StringReader; diff --git a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadTermQuery.java b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadTermQuery.java index 63340473028..f453b0d0af7 100644 --- a/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadTermQuery.java +++ b/lucene/queries/src/test/org/apache/lucene/queries/payloads/TestPayloadTermQuery.java @@ -1,4 +1,3 @@ -package org.apache.lucene.queries.payloads; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.queries.payloads; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.queries.payloads; import java.io.IOException; import org.apache.lucene.analysis.Analyzer; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/analyzing/AnalyzingQueryParser.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/analyzing/AnalyzingQueryParser.java index cf33421f694..49690fee265 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/analyzing/AnalyzingQueryParser.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/analyzing/AnalyzingQueryParser.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.analyzing; - /* * 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.lucene.queryparser.analyzing; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.analyzing; import java.io.IOException; import java.util.regex.Matcher; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/analyzing/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/analyzing/package-info.java index 77397b45cbf..afd74c5b723 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/analyzing/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/analyzing/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * QueryParser that passes Fuzzy-, Prefix-, Range-, and WildcardQuerys through the given analyzer. */ diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/FastCharStream.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/FastCharStream.java index 32231f78bdb..ad0646b77e0 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/FastCharStream.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/FastCharStream.java @@ -1,6 +1,3 @@ -// FastCharStream.java -package org.apache.lucene.queryparser.classic; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,8 +13,8 @@ package org.apache.lucene.queryparser.classic; * 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.queryparser.classic; import java.io.*; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/MultiFieldQueryParser.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/MultiFieldQueryParser.java index ade904a045b..02d25c409ec 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/MultiFieldQueryParser.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/MultiFieldQueryParser.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.classic; - /* * 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.lucene.queryparser.classic; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.classic; import java.util.ArrayList; import java.util.List; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserBase.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserBase.java index 8e1790556a7..c988b8c0908 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserBase.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserBase.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.queryparser.classic; import java.io.IOException; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/package-info.java index ab3451f65b0..5770d1b3fe1 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/package-info.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - /** * A simple query parser implemented with JavaCC. * diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/complexPhrase/ComplexPhraseQueryParser.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/complexPhrase/ComplexPhraseQueryParser.java index 7a5f77af710..1faea18c1a7 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/complexPhrase/ComplexPhraseQueryParser.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/complexPhrase/ComplexPhraseQueryParser.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.complexPhrase; - /* * 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.lucene.queryparser.complexPhrase; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.complexPhrase; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/complexPhrase/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/complexPhrase/package-info.java index fbe1ccec679..8c684ee1fbb 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/complexPhrase/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/complexPhrase/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * QueryParser which permits complex phrase query syntax eg "(john jon jonathan~) peters*" */ diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/ext/ExtendableQueryParser.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/ext/ExtendableQueryParser.java index 19560b0d15d..c023d081277 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/ext/ExtendableQueryParser.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/ext/ExtendableQueryParser.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.ext; - /* * 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.lucene.queryparser.ext; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.ext; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.queryparser.ext.Extensions.Pair; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/ext/ExtensionQuery.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/ext/ExtensionQuery.java index 423595ec1b8..3c5e4c3a0a3 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/ext/ExtensionQuery.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/ext/ExtensionQuery.java @@ -1,7 +1,3 @@ -package org.apache.lucene.queryparser.ext; - -import org.apache.lucene.queryparser.classic.QueryParser; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import org.apache.lucene.queryparser.classic.QueryParser; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.ext; + +import org.apache.lucene.queryparser.classic.QueryParser; /** * {@link ExtensionQuery} holds all query components extracted from the original diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/ext/Extensions.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/ext/Extensions.java index 86e616b2a0c..f27fbda313f 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/ext/Extensions.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/ext/Extensions.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.ext; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.lucene.queryparser.ext; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.ext; + import org.apache.lucene.queryparser.classic.QueryParser; import org.apache.lucene.queryparser.classic.QueryParserBase; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/ext/ParserExtension.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/ext/ParserExtension.java index 88573efa677..17eb31472ba 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/ext/ParserExtension.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/ext/ParserExtension.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.ext; - /* * 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.lucene.queryparser.ext; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.ext; import org.apache.lucene.queryparser.classic.ParseException; import org.apache.lucene.search.Query; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/ext/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/ext/package-info.java index a5e9000c77f..00a5010083e 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/ext/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/ext/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Extendable QueryParser provides a simple and flexible extension mechanism by overloading query field names. */ diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/QueryNodeError.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/QueryNodeError.java index e26ddcaf62f..e54017b5fb3 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/QueryNodeError.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/QueryNodeError.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core; - /* * 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.lucene.queryparser.flexible.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core; import org.apache.lucene.queryparser.flexible.messages.Message; import org.apache.lucene.queryparser.flexible.messages.NLSException; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/QueryNodeException.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/QueryNodeException.java index 2d5949828f0..5450e8036a9 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/QueryNodeException.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/QueryNodeException.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core; - /* * 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.lucene.queryparser.flexible.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core; import java.util.Locale; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/QueryNodeParseException.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/QueryNodeParseException.java index bbe85ba8d37..43f0c38f70e 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/QueryNodeParseException.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/QueryNodeParseException.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core; - /* * 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.lucene.queryparser.flexible.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core; import org.apache.lucene.queryparser.flexible.messages.Message; import org.apache.lucene.queryparser.flexible.messages.MessageImpl; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/QueryParserHelper.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/QueryParserHelper.java index ef00f76e35a..968ba179f13 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/QueryParserHelper.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/QueryParserHelper.java @@ -1,11 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core; - -import org.apache.lucene.queryparser.flexible.core.builders.QueryBuilder; -import org.apache.lucene.queryparser.flexible.core.config.QueryConfigHandler; -import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; -import org.apache.lucene.queryparser.flexible.core.parser.SyntaxParser; -import org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessor; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -22,8 +14,14 @@ import org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessor * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core; + +import org.apache.lucene.queryparser.flexible.core.builders.QueryBuilder; +import org.apache.lucene.queryparser.flexible.core.config.QueryConfigHandler; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; +import org.apache.lucene.queryparser.flexible.core.parser.SyntaxParser; +import org.apache.lucene.queryparser.flexible.core.processors.QueryNodeProcessor; - /** * This class is a helper for the query parser framework, it does all the three * query parser phrases at once: text parsing, query processing and query diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/builders/QueryBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/builders/QueryBuilder.java index cd4573aec76..b7e3257fd1c 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/builders/QueryBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/builders/QueryBuilder.java @@ -1,8 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.builders; - -import org.apache.lucene.queryparser.flexible.core.QueryNodeException; -import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -19,7 +14,10 @@ import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.builders; +import org.apache.lucene.queryparser.flexible.core.QueryNodeException; +import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; /** * This interface is used by implementors classes that builds some kind of diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/builders/QueryTreeBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/builders/QueryTreeBuilder.java index 567a326f227..45f91749f33 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/builders/QueryTreeBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/builders/QueryTreeBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.builders; - /* * 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.lucene.queryparser.flexible.core.builders; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.builders; import java.util.HashMap; import java.util.List; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/builders/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/builders/package-info.java index d24c915ca9e..8881b4319c5 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/builders/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/builders/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Necessary classes to implement query builders. * diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/AbstractQueryConfig.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/AbstractQueryConfig.java index 520b6b82f7a..e60f931c7bb 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/AbstractQueryConfig.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/AbstractQueryConfig.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.config; - /* * 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.lucene.queryparser.flexible.core.config; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.config; import java.util.HashMap; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/ConfigurationKey.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/ConfigurationKey.java index 5689a9a537f..7f402e71e23 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/ConfigurationKey.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/ConfigurationKey.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.config; - /* * 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.lucene.queryparser.flexible.core.config; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.config; /** * An instance of this class represents a key that is used to retrieve a value diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/FieldConfig.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/FieldConfig.java index b3876caf81b..c8604d1cca3 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/FieldConfig.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/FieldConfig.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.config; - /* * 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.lucene.queryparser.flexible.core.config; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.config; /** * This class represents a field configuration. diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/FieldConfigListener.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/FieldConfigListener.java index f729377385f..87bbd1c11f8 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/FieldConfigListener.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/FieldConfigListener.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.config; - /* * 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.lucene.queryparser.flexible.core.config; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.config; /** * This interface should be implemented by classes that wants to listen for diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/QueryConfigHandler.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/QueryConfigHandler.java index 3efb435b741..41362c363a6 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/QueryConfigHandler.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/QueryConfigHandler.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.config; - /* * 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.lucene.queryparser.flexible.core.config; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.config; import java.util.LinkedList; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/package-info.java index f3719e984d7..cc3b8787ad3 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Base classes used to configure the query processing. * diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/messages/QueryParserMessages.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/messages/QueryParserMessages.java index 6ceb7df0870..bf790e901b1 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/messages/QueryParserMessages.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/messages/QueryParserMessages.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.messages; - /* * 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.lucene.queryparser.flexible.core.messages; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.messages; import org.apache.lucene.queryparser.flexible.messages.NLS; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/messages/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/messages/package-info.java index 75fbb21997e..149125225f4 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/messages/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/messages/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Messages usually used by query parser implementations. * diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/AndQueryNode.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/AndQueryNode.java index 1090a479892..f2e3597338a 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/AndQueryNode.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/AndQueryNode.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.nodes; - /* * 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.lucene.queryparser.flexible.core.nodes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.nodes; import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/AnyQueryNode.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/AnyQueryNode.java index ad8ff39cc52..a6874eee448 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/AnyQueryNode.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/AnyQueryNode.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.nodes; - /* * 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.lucene.queryparser.flexible.core.nodes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.nodes; import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/BooleanQueryNode.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/BooleanQueryNode.java index fe81a0b3680..76c74bf0d71 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/BooleanQueryNode.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/BooleanQueryNode.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.nodes; - /* * 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.lucene.queryparser.flexible.core.nodes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.nodes; import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/BoostQueryNode.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/BoostQueryNode.java index 3eeee1dceb1..d7cce31a32d 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/BoostQueryNode.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/BoostQueryNode.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.nodes; - /* * 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.lucene.queryparser.flexible.core.nodes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.nodes; import java.util.List; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/DeletedQueryNode.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/DeletedQueryNode.java index 7974a130af4..51f60f076ca 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/DeletedQueryNode.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/DeletedQueryNode.java @@ -1,7 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.nodes; - -import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.nodes; + +import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; import org.apache.lucene.queryparser.flexible.core.processors.RemoveDeletedQueryNodesProcessor; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/FieldQueryNode.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/FieldQueryNode.java index 66ecc948f77..e9813c4cc13 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/FieldQueryNode.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/FieldQueryNode.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.nodes; - /* * 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.lucene.queryparser.flexible.core.nodes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.nodes; import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/FieldValuePairQueryNode.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/FieldValuePairQueryNode.java index daf0ae176a0..85f0bfb87a0 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/FieldValuePairQueryNode.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/FieldValuePairQueryNode.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.nodes; - /* * 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.lucene.queryparser.flexible.core.nodes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.nodes; /** * This interface should be implemented by {@link QueryNode} that holds a field diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/FieldableNode.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/FieldableNode.java index 6ad248abbae..3ca9b5faf66 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/FieldableNode.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/FieldableNode.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.nodes; - /* * 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.lucene.queryparser.flexible.core.nodes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.nodes; /** * A query node implements {@link FieldableNode} interface to indicate that its diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/FuzzyQueryNode.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/FuzzyQueryNode.java index b009a4bfc94..8dc3cf07ae4 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/FuzzyQueryNode.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/FuzzyQueryNode.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.nodes; - /* * 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.lucene.queryparser.flexible.core.nodes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.nodes; import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/GroupQueryNode.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/GroupQueryNode.java index 0eff69a2969..e28ac029a69 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/GroupQueryNode.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/GroupQueryNode.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.nodes; - /* * 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.lucene.queryparser.flexible.core.nodes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.nodes; import java.util.ArrayList; import java.util.List; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/MatchAllDocsQueryNode.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/MatchAllDocsQueryNode.java index c6e573a8e31..39d06ce9dbe 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/MatchAllDocsQueryNode.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/MatchAllDocsQueryNode.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.nodes; - /* * 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.lucene.queryparser.flexible.core.nodes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.nodes; import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/MatchNoDocsQueryNode.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/MatchNoDocsQueryNode.java index 06fbaf90276..d676c4d3972 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/MatchNoDocsQueryNode.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/MatchNoDocsQueryNode.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.nodes; - /* * 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.lucene.queryparser.flexible.core.nodes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.nodes; /** * A {@link MatchNoDocsQueryNode} indicates that a query node tree or subtree diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/ModifierQueryNode.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/ModifierQueryNode.java index a88667eecde..5e9855af458 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/ModifierQueryNode.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/ModifierQueryNode.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.nodes; - /* * 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.lucene.queryparser.flexible.core.nodes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.nodes; import java.util.ArrayList; import java.util.List; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/NoTokenFoundQueryNode.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/NoTokenFoundQueryNode.java index a40de2ee1a2..e0e73b484ee 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/NoTokenFoundQueryNode.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/NoTokenFoundQueryNode.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.nodes; - /* * 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.lucene.queryparser.flexible.core.nodes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.nodes; import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/OpaqueQueryNode.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/OpaqueQueryNode.java index 6a61f79b7cc..1c349d7c9cc 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/OpaqueQueryNode.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/OpaqueQueryNode.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.nodes; - /* * 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.lucene.queryparser.flexible.core.nodes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.nodes; import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/OrQueryNode.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/OrQueryNode.java index 3ba90b090b3..93525689fb2 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/OrQueryNode.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/OrQueryNode.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.nodes; - /* * 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.lucene.queryparser.flexible.core.nodes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.nodes; import java.util.Iterator; import java.util.List; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/PathQueryNode.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/PathQueryNode.java index 2235ad2b179..586044c94d9 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/PathQueryNode.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/PathQueryNode.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.nodes; - /* * 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.lucene.queryparser.flexible.core.nodes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.nodes; import java.util.ArrayList; import java.util.List; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/PhraseSlopQueryNode.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/PhraseSlopQueryNode.java index 0b280e568e6..ec669449006 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/PhraseSlopQueryNode.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/PhraseSlopQueryNode.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.nodes; - /* * 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.lucene.queryparser.flexible.core.nodes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.nodes; import org.apache.lucene.search.PhraseQuery; // javadocs import org.apache.lucene.queryparser.flexible.messages.MessageImpl; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/ProximityQueryNode.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/ProximityQueryNode.java index 1efb333a701..4237e73eb59 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/ProximityQueryNode.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/ProximityQueryNode.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.nodes; - /* * 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.lucene.queryparser.flexible.core.nodes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.nodes; import java.util.List; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/QueryNode.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/QueryNode.java index 4bcd1589cb4..4f15f7c7c91 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/QueryNode.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/QueryNode.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.nodes; - /* * 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.lucene.queryparser.flexible.core.nodes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.nodes; import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/QueryNodeImpl.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/QueryNodeImpl.java index 6ff642d24d2..7d9316bd155 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/QueryNodeImpl.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/QueryNodeImpl.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.nodes; - /* * 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.lucene.queryparser.flexible.core.nodes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.nodes; import java.util.ArrayList; import java.util.Hashtable; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/QuotedFieldQueryNode.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/QuotedFieldQueryNode.java index a369b355f66..d2f9a2bb62d 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/QuotedFieldQueryNode.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/QuotedFieldQueryNode.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.nodes; - /* * 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.lucene.queryparser.flexible.core.nodes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.nodes; import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/RangeQueryNode.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/RangeQueryNode.java index a076b58d9df..c9f804e77b3 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/RangeQueryNode.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/RangeQueryNode.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.nodes; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,8 +14,9 @@ package org.apache.lucene.queryparser.flexible.core.nodes; * See the License for the specific language governing permissions and * limitations under the License. */ - - /** +package org.apache.lucene.queryparser.flexible.core.nodes; + +/** * This interface should be implemented by a {@link QueryNode} that represents * some kind of range query. * diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/SlopQueryNode.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/SlopQueryNode.java index 0973c2a975a..16e19e395ac 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/SlopQueryNode.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/SlopQueryNode.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.nodes; - /* * 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.lucene.queryparser.flexible.core.nodes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.nodes; import org.apache.lucene.queryparser.flexible.messages.MessageImpl; import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/TextableQueryNode.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/TextableQueryNode.java index 61878a78242..57a3c173197 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/TextableQueryNode.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/TextableQueryNode.java @@ -1,21 +1,20 @@ -package org.apache.lucene.queryparser.flexible.core.nodes; - /* * 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 - * + * 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. + * 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.queryparser.flexible.core.nodes; /** * Interface for a node that has text as a {@link CharSequence} diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/TokenizedPhraseQueryNode.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/TokenizedPhraseQueryNode.java index bf80ebf73de..b48ab54ca98 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/TokenizedPhraseQueryNode.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/TokenizedPhraseQueryNode.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.nodes; - /* * 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.lucene.queryparser.flexible.core.nodes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.nodes; import java.util.List; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/ValueQueryNode.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/ValueQueryNode.java index 9b1815654a0..38100300242 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/ValueQueryNode.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/ValueQueryNode.java @@ -1,21 +1,20 @@ -package org.apache.lucene.queryparser.flexible.core.nodes; - /* * 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 - * + * 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. + * 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.queryparser.flexible.core.nodes; /** * This interface should be implemented by {@link QueryNode} that holds an diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/package-info.java index c9d55eab12c..a4f8f6e7b5b 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Query nodes commonly used by query parser implementations. * diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/package-info.java index dd8c4cd63ca..869fdc8197b 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Core classes of the flexible query parser framework. * diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/parser/EscapeQuerySyntax.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/parser/EscapeQuerySyntax.java index d677d14bd24..0cf6b8246f5 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/parser/EscapeQuerySyntax.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/parser/EscapeQuerySyntax.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.parser; - /* * 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.lucene.queryparser.flexible.core.parser; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.parser; import java.util.Locale; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/parser/SyntaxParser.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/parser/SyntaxParser.java index 857f03c3aa1..d08d13c78ea 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/parser/SyntaxParser.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/parser/SyntaxParser.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.parser; - /* * 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.lucene.queryparser.flexible.core.parser; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.parser; import org.apache.lucene.queryparser.flexible.core.QueryNodeParseException; import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/parser/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/parser/package-info.java index 273138d8762..3359d77178d 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/parser/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/parser/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Necessary interfaces to implement text parsers. * diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/NoChildOptimizationQueryNodeProcessor.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/NoChildOptimizationQueryNodeProcessor.java index dcdad7a24bf..873c425940d 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/NoChildOptimizationQueryNodeProcessor.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/NoChildOptimizationQueryNodeProcessor.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.processors; - /* * 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.lucene.queryparser.flexible.core.processors; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.processors; import java.util.List; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/QueryNodeProcessor.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/QueryNodeProcessor.java index 93591f524c9..7f735fa2b1c 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/QueryNodeProcessor.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/QueryNodeProcessor.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.processors; - /* * 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.lucene.queryparser.flexible.core.processors; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.processors; import org.apache.lucene.queryparser.flexible.core.QueryNodeException; import org.apache.lucene.queryparser.flexible.core.config.QueryConfigHandler; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/QueryNodeProcessorImpl.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/QueryNodeProcessorImpl.java index 92f0d6e631f..58a467bc72b 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/QueryNodeProcessorImpl.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/QueryNodeProcessorImpl.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.processors; - /* * 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.lucene.queryparser.flexible.core.processors; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.processors; import java.util.ArrayList; import java.util.List; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/QueryNodeProcessorPipeline.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/QueryNodeProcessorPipeline.java index b439798b470..f6e9d0085c8 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/QueryNodeProcessorPipeline.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/QueryNodeProcessorPipeline.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.processors; - /* * 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.lucene.queryparser.flexible.core.processors; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.processors; import java.util.*; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/RemoveDeletedQueryNodesProcessor.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/RemoveDeletedQueryNodesProcessor.java index ddde390758d..d25148574f3 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/RemoveDeletedQueryNodesProcessor.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/RemoveDeletedQueryNodesProcessor.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.processors; - /* * 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.lucene.queryparser.flexible.core.processors; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.processors; import java.util.Iterator; import java.util.List; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/package-info.java index 86ce57b5d99..74f2de63cb0 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Interfaces and implementations used by query node processors * diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/util/QueryNodeOperation.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/util/QueryNodeOperation.java index fc1f09778e1..4280d1c21df 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/util/QueryNodeOperation.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/util/QueryNodeOperation.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.util; - /* * 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.lucene.queryparser.flexible.core.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.util; import org.apache.lucene.queryparser.flexible.core.QueryNodeError; import org.apache.lucene.queryparser.flexible.core.nodes.AndQueryNode; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/util/StringUtils.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/util/StringUtils.java index d7b46d50af5..94f47bea9c4 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/util/StringUtils.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/util/StringUtils.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.util; - /* * 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.lucene.queryparser.flexible.core.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.util; /** * String manipulation routines diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/util/UnescapedCharSequence.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/util/UnescapedCharSequence.java index 0069c2f9b76..5e74cac5861 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/util/UnescapedCharSequence.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/util/UnescapedCharSequence.java @@ -1,7 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.util; - -import java.util.Locale; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import java.util.Locale; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.util; + +import java.util.Locale; /** * CharsSequence with escaped chars information. diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/util/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/util/package-info.java index d5f8e5b16e1..a5748b70c2f 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/util/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/util/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Utility classes to used with the Query Parser. *

Utility classes to used with the Query Parser

diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/Message.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/Message.java index e4a9d2c2ef0..e677ac70b5d 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/Message.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/Message.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.messages; - /* * 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.lucene.queryparser.flexible.messages; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.messages; import java.util.Locale; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/MessageImpl.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/MessageImpl.java index 3e74f9f9607..de911518522 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/MessageImpl.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/MessageImpl.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.messages; - /* * 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.lucene.queryparser.flexible.messages; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.messages; import java.util.Locale; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/NLS.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/NLS.java index bc849f24af7..b32ba2fc723 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/NLS.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/NLS.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.messages; - /* * 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.lucene.queryparser.flexible.messages; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.messages; import java.lang.reflect.Field; import java.lang.reflect.Modifier; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/NLSException.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/NLSException.java index 2ac4674f964..6e7f3b18eb4 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/NLSException.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/NLSException.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.messages; - /* * 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.lucene.queryparser.flexible.messages; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.messages; /** * Interface that exceptions should implement to support lazy loading of messages. diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/package-info.java index 07cef021112..6046ff566de 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * For Native Language Support (NLS), system of software internationalization. * diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/precedence/PrecedenceQueryParser.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/precedence/PrecedenceQueryParser.java index a7954395875..880e795e89c 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/precedence/PrecedenceQueryParser.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/precedence/PrecedenceQueryParser.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.precedence; - /* * 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.lucene.queryparser.flexible.precedence; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.precedence; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.queryparser.flexible.standard.StandardQueryParser; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/precedence/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/precedence/package-info.java index 2d46676ec12..d0398ab433c 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/precedence/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/precedence/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Precedence Query Parser Implementation * diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/precedence/processors/BooleanModifiersQueryNodeProcessor.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/precedence/processors/BooleanModifiersQueryNodeProcessor.java index 85cdae9e115..b23f30e0dd9 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/precedence/processors/BooleanModifiersQueryNodeProcessor.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/precedence/processors/BooleanModifiersQueryNodeProcessor.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.precedence.processors; - /* * 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.lucene.queryparser.flexible.precedence.processors; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.precedence.processors; import java.util.ArrayList; import java.util.List; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/precedence/processors/PrecedenceQueryNodeProcessorPipeline.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/precedence/processors/PrecedenceQueryNodeProcessorPipeline.java index c35d5624881..6234f3e85db 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/precedence/processors/PrecedenceQueryNodeProcessorPipeline.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/precedence/processors/PrecedenceQueryNodeProcessorPipeline.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.precedence.processors; - /* * 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.lucene.queryparser.flexible.precedence.processors; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.precedence.processors; import org.apache.lucene.queryparser.flexible.precedence.PrecedenceQueryParser; import org.apache.lucene.queryparser.flexible.standard.processors.BooleanQuery2ModifierNodeProcessor; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/CommonQueryParserConfiguration.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/CommonQueryParserConfiguration.java index 91c7dd274ed..55e43cd1f65 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/CommonQueryParserConfiguration.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/CommonQueryParserConfiguration.java @@ -1,15 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard; - -import java.util.Locale; -import java.util.TimeZone; -import java.util.TooManyListenersException; - -import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.document.DateTools; -import org.apache.lucene.document.DateTools.Resolution; -import org.apache.lucene.search.FuzzyQuery; -import org.apache.lucene.search.MultiTermQuery; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -26,6 +14,17 @@ import org.apache.lucene.search.MultiTermQuery; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard; + +import java.util.Locale; +import java.util.TimeZone; +import java.util.TooManyListenersException; + +import org.apache.lucene.analysis.Analyzer; +import org.apache.lucene.document.DateTools; +import org.apache.lucene.document.DateTools.Resolution; +import org.apache.lucene.search.FuzzyQuery; +import org.apache.lucene.search.MultiTermQuery; /** * Configuration options common across queryparser implementations. diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/QueryParserUtil.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/QueryParserUtil.java index 535f146fe92..87b0a40b426 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/QueryParserUtil.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/QueryParserUtil.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard; - /* * 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.lucene.queryparser.flexible.standard; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.queryparser.flexible.core.QueryNodeException; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/StandardQueryParser.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/StandardQueryParser.java index 27338004aa2..ada65a4ca7a 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/StandardQueryParser.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/StandardQueryParser.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard; - /* * 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.lucene.queryparser.flexible.standard; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard; import java.util.Locale; import java.util.Map; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/AnyQueryNodeBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/AnyQueryNodeBuilder.java index e9b191bb466..09d4b700c3b 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/AnyQueryNodeBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/AnyQueryNodeBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.builders; - /* * 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.lucene.queryparser.flexible.standard.builders; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.builders; import java.util.List; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/BooleanQueryNodeBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/BooleanQueryNodeBuilder.java index 2dadd71f248..17525e428b9 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/BooleanQueryNodeBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/BooleanQueryNodeBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.builders; - /* * 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.lucene.queryparser.flexible.standard.builders; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.builders; import java.util.List; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/BoostQueryNodeBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/BoostQueryNodeBuilder.java index 239b09dfabd..b9c67a0ddba 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/BoostQueryNodeBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/BoostQueryNodeBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.builders; - /* * 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.lucene.queryparser.flexible.standard.builders; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.builders; import org.apache.lucene.queryparser.flexible.core.QueryNodeException; import org.apache.lucene.queryparser.flexible.core.builders.QueryTreeBuilder; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/DummyQueryNodeBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/DummyQueryNodeBuilder.java index 14dc324073a..593e6ce3a11 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/DummyQueryNodeBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/DummyQueryNodeBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.builders; - /* * 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.lucene.queryparser.flexible.standard.builders; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.builders; import org.apache.lucene.queryparser.flexible.core.QueryNodeException; import org.apache.lucene.queryparser.flexible.core.builders.QueryTreeBuilder; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/FieldQueryNodeBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/FieldQueryNodeBuilder.java index 5e55d243bbc..cc1f4714ba2 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/FieldQueryNodeBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/FieldQueryNodeBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.builders; - /* * 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.lucene.queryparser.flexible.standard.builders; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.builders; import org.apache.lucene.index.Term; import org.apache.lucene.queryparser.flexible.core.QueryNodeException; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/FuzzyQueryNodeBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/FuzzyQueryNodeBuilder.java index 1d472ea9f74..2575e802053 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/FuzzyQueryNodeBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/FuzzyQueryNodeBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.builders; - /* * 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.lucene.queryparser.flexible.standard.builders; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.builders; import org.apache.lucene.index.Term; import org.apache.lucene.queryparser.flexible.core.QueryNodeException; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/GroupQueryNodeBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/GroupQueryNodeBuilder.java index 6b1b3c522b6..007bc49b965 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/GroupQueryNodeBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/GroupQueryNodeBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.builders; - /* * 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.lucene.queryparser.flexible.standard.builders; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.builders; import org.apache.lucene.queryparser.flexible.core.QueryNodeException; import org.apache.lucene.queryparser.flexible.core.builders.QueryTreeBuilder; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/MatchAllDocsQueryNodeBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/MatchAllDocsQueryNodeBuilder.java index a8828d147ff..d55bfd67dde 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/MatchAllDocsQueryNodeBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/MatchAllDocsQueryNodeBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.builders; - /* * 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.lucene.queryparser.flexible.standard.builders; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.builders; import org.apache.lucene.queryparser.flexible.messages.MessageImpl; import org.apache.lucene.queryparser.flexible.core.QueryNodeException; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/MatchNoDocsQueryNodeBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/MatchNoDocsQueryNodeBuilder.java index 17b85ca8d1e..40584727f81 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/MatchNoDocsQueryNodeBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/MatchNoDocsQueryNodeBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.builders; - /* * 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.lucene.queryparser.flexible.standard.builders; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.builders; import org.apache.lucene.queryparser.flexible.core.QueryNodeException; import org.apache.lucene.queryparser.flexible.core.messages.QueryParserMessages; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/ModifierQueryNodeBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/ModifierQueryNodeBuilder.java index 4f050041757..9e81f04a0d5 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/ModifierQueryNodeBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/ModifierQueryNodeBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.builders; - /* * 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.lucene.queryparser.flexible.standard.builders; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.builders; import org.apache.lucene.queryparser.flexible.core.QueryNodeException; import org.apache.lucene.queryparser.flexible.core.builders.QueryTreeBuilder; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/MultiPhraseQueryNodeBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/MultiPhraseQueryNodeBuilder.java index 7a695d90378..6976a04ceda 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/MultiPhraseQueryNodeBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/MultiPhraseQueryNodeBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.builders; - /* * 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.lucene.queryparser.flexible.standard.builders; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.builders; import java.util.LinkedList; import java.util.List; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/NumericRangeQueryNodeBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/NumericRangeQueryNodeBuilder.java index b0805fea086..6c8790ff8f0 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/NumericRangeQueryNodeBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/NumericRangeQueryNodeBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.builders; - /* * 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.lucene.queryparser.flexible.standard.builders; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.builders; import org.apache.lucene.document.FieldType; import org.apache.lucene.queryparser.flexible.core.QueryNodeException; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/PhraseQueryNodeBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/PhraseQueryNodeBuilder.java index 4f7effabe3f..60260d89d9d 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/PhraseQueryNodeBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/PhraseQueryNodeBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.builders; - /* * 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.lucene.queryparser.flexible.standard.builders; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.builders; import java.util.List; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/PrefixWildcardQueryNodeBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/PrefixWildcardQueryNodeBuilder.java index 298717f8067..b4274575c07 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/PrefixWildcardQueryNodeBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/PrefixWildcardQueryNodeBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.builders; - /* * 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.lucene.queryparser.flexible.standard.builders; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.builders; import org.apache.lucene.index.Term; import org.apache.lucene.queryparser.flexible.core.QueryNodeException; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/RegexpQueryNodeBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/RegexpQueryNodeBuilder.java index 52242aa76fa..b2198b41fda 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/RegexpQueryNodeBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/RegexpQueryNodeBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.builders; - /* * 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.lucene.queryparser.flexible.standard.builders; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.builders; import org.apache.lucene.index.Term; import org.apache.lucene.queryparser.flexible.core.QueryNodeException; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/SlopQueryNodeBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/SlopQueryNodeBuilder.java index 47dcbe0ab48..e9643469432 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/SlopQueryNodeBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/SlopQueryNodeBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.builders; - /* * 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.lucene.queryparser.flexible.standard.builders; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.builders; import org.apache.lucene.queryparser.flexible.core.QueryNodeException; import org.apache.lucene.queryparser.flexible.core.builders.QueryTreeBuilder; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/StandardBooleanQueryNodeBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/StandardBooleanQueryNodeBuilder.java index 5f09b478a2c..83f6a6b77f5 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/StandardBooleanQueryNodeBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/StandardBooleanQueryNodeBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.builders; - /* * 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.lucene.queryparser.flexible.standard.builders; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.builders; import java.util.List; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/StandardQueryBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/StandardQueryBuilder.java index 6ca88dc8c5a..c9fb3c14b8a 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/StandardQueryBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/StandardQueryBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.builders; - /* * 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.lucene.queryparser.flexible.standard.builders; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.builders; import org.apache.lucene.queryparser.flexible.core.QueryNodeException; import org.apache.lucene.queryparser.flexible.core.builders.QueryBuilder; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/StandardQueryTreeBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/StandardQueryTreeBuilder.java index af672b39076..2d7c6434be8 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/StandardQueryTreeBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/StandardQueryTreeBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.builders; - /* * 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.lucene.queryparser.flexible.standard.builders; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.builders; import org.apache.lucene.queryparser.flexible.core.QueryNodeException; import org.apache.lucene.queryparser.flexible.core.builders.QueryTreeBuilder; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/TermRangeQueryNodeBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/TermRangeQueryNodeBuilder.java index 7e34e5edbe8..90abdf7c21b 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/TermRangeQueryNodeBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/TermRangeQueryNodeBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.builders; - /* * 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.lucene.queryparser.flexible.standard.builders; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.builders; import org.apache.lucene.queryparser.flexible.core.QueryNodeException; import org.apache.lucene.queryparser.flexible.core.nodes.FieldQueryNode; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/WildcardQueryNodeBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/WildcardQueryNodeBuilder.java index aaa513d9aac..d01d601fb7b 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/WildcardQueryNodeBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/WildcardQueryNodeBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.builders; - /* * 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.lucene.queryparser.flexible.standard.builders; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.builders; import org.apache.lucene.index.Term; import org.apache.lucene.queryparser.flexible.core.QueryNodeException; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/package-info.java index 2d950107da5..844165c7d2b 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Standard Lucene Query Node Builders. * diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/FieldBoostMapFCListener.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/FieldBoostMapFCListener.java index 4f845c663d6..16db310c7ac 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/FieldBoostMapFCListener.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/FieldBoostMapFCListener.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.config; - /* * 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.lucene.queryparser.flexible.standard.config; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.config; import java.util.Map; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/FieldDateResolutionFCListener.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/FieldDateResolutionFCListener.java index 8111b910bb8..ae880088df5 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/FieldDateResolutionFCListener.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/FieldDateResolutionFCListener.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.config; - /* * 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.lucene.queryparser.flexible.standard.config; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.config; import java.util.Map; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/FuzzyConfig.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/FuzzyConfig.java index 9eaa9352b95..b0ca671514f 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/FuzzyConfig.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/FuzzyConfig.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.config; - /* * 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.lucene.queryparser.flexible.standard.config; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.config; import org.apache.lucene.search.FuzzyQuery; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/NumberDateFormat.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/NumberDateFormat.java index fd0bfe52fe1..e3a4ffa29fd 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/NumberDateFormat.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/NumberDateFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.config; - /* * 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.lucene.queryparser.flexible.standard.config; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.config; import java.text.DateFormat; import java.text.FieldPosition; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/NumericConfig.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/NumericConfig.java index 39f2f6c5fa0..c457a4ebc46 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/NumericConfig.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/NumericConfig.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.config; - /* * 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.lucene.queryparser.flexible.standard.config; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.config; import java.text.NumberFormat; import java.util.Objects; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/NumericFieldConfigListener.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/NumericFieldConfigListener.java index 87d3346677c..c28cf2c92df 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/NumericFieldConfigListener.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/NumericFieldConfigListener.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.config; - /* * 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.lucene.queryparser.flexible.standard.config; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.config; import java.util.Map; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/StandardQueryConfigHandler.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/StandardQueryConfigHandler.java index 7570ecf1e51..77bd7bb639c 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/StandardQueryConfigHandler.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/StandardQueryConfigHandler.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.config; - /* * 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.lucene.queryparser.flexible.standard.config; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.config; import java.util.HashMap; import java.util.LinkedHashMap; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/package-info.java index 6f06e796936..8d86637f80d 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Standard Lucene Query Configuration. * diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/AbstractRangeQueryNode.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/AbstractRangeQueryNode.java index 8e83fe01e8c..c2f0a804534 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/AbstractRangeQueryNode.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/AbstractRangeQueryNode.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.nodes; - /* * 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.lucene.queryparser.flexible.standard.nodes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.nodes; import java.util.ArrayList; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/BooleanModifierNode.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/BooleanModifierNode.java index fc46a9c39fa..dd81d09568d 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/BooleanModifierNode.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/BooleanModifierNode.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.nodes; - /* * 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.lucene.queryparser.flexible.standard.nodes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.nodes; import org.apache.lucene.queryparser.flexible.core.nodes.ModifierQueryNode; import org.apache.lucene.queryparser.flexible.core.nodes.QueryNode; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/MultiPhraseQueryNode.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/MultiPhraseQueryNode.java index 9655724e1da..997c2d12d28 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/MultiPhraseQueryNode.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/MultiPhraseQueryNode.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.nodes; - /* * 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.lucene.queryparser.flexible.standard.nodes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.nodes; import java.util.List; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/NumericQueryNode.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/NumericQueryNode.java index c1b5c8cb427..7509a39bd71 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/NumericQueryNode.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/NumericQueryNode.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.nodes; - /* * 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.lucene.queryparser.flexible.standard.nodes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.nodes; import java.text.NumberFormat; import java.util.Locale; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/NumericRangeQueryNode.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/NumericRangeQueryNode.java index cf86f8a48d2..c132aa1dd0d 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/NumericRangeQueryNode.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/NumericRangeQueryNode.java @@ -1,21 +1,20 @@ -package org.apache.lucene.queryparser.flexible.standard.nodes; - /* * 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 - * + * 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. + * 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.queryparser.flexible.standard.nodes; import org.apache.lucene.document.FieldType; import org.apache.lucene.document.FieldType.LegacyNumericType; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/PrefixWildcardQueryNode.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/PrefixWildcardQueryNode.java index ce3b3b1326d..52a84807134 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/PrefixWildcardQueryNode.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/PrefixWildcardQueryNode.java @@ -1,7 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.nodes; - -import org.apache.lucene.queryparser.flexible.core.nodes.FieldQueryNode; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import org.apache.lucene.queryparser.flexible.core.nodes.FieldQueryNode; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.nodes; + +import org.apache.lucene.queryparser.flexible.core.nodes.FieldQueryNode; /** * A {@link PrefixWildcardQueryNode} represents wildcardquery that matches abc* diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/RegexpQueryNode.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/RegexpQueryNode.java index efb7f0237fb..cba2612cb61 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/RegexpQueryNode.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/RegexpQueryNode.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.nodes; - /* * 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.lucene.queryparser.flexible.standard.nodes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.nodes; import org.apache.lucene.queryparser.flexible.core.nodes.FieldableNode; import org.apache.lucene.queryparser.flexible.core.nodes.QueryNodeImpl; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/StandardBooleanQueryNode.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/StandardBooleanQueryNode.java index 241dd209abb..8d86fd5e300 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/StandardBooleanQueryNode.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/StandardBooleanQueryNode.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.nodes; - /* * 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.lucene.queryparser.flexible.standard.nodes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.nodes; import java.util.List; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/TermRangeQueryNode.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/TermRangeQueryNode.java index 05583e0bcfc..e2766a098be 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/TermRangeQueryNode.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/TermRangeQueryNode.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.nodes; - /* * 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.lucene.queryparser.flexible.standard.nodes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.nodes; import org.apache.lucene.queryparser.flexible.core.nodes.FieldQueryNode; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/WildcardQueryNode.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/WildcardQueryNode.java index 2fae7523afe..afd4f9fe4e5 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/WildcardQueryNode.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/WildcardQueryNode.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.nodes; - /* * 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.lucene.queryparser.flexible.standard.nodes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.nodes; import org.apache.lucene.queryparser.flexible.core.nodes.FieldQueryNode; import org.apache.lucene.queryparser.flexible.core.parser.EscapeQuerySyntax; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/package-info.java index 0a9b75a0177..de903123c4b 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Standard Lucene Query Nodes. * diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/package-info.java index 740ca4c2cee..49e4caf2647 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Implementation of the {@linkplain org.apache.lucene.queryparser.classic Lucene classic query parser} using the flexible query parser frameworks * diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/EscapeQuerySyntaxImpl.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/EscapeQuerySyntaxImpl.java index 3598da073c9..679d913d724 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/EscapeQuerySyntaxImpl.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/EscapeQuerySyntaxImpl.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.parser; - /* * 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.lucene.queryparser.flexible.standard.parser; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.parser; import java.util.Locale; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/FastCharStream.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/FastCharStream.java index 33187abc491..06bf9ab355a 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/FastCharStream.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/FastCharStream.java @@ -1,6 +1,3 @@ -// FastCharStream.java -package org.apache.lucene.queryparser.flexible.standard.parser; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,8 +13,8 @@ package org.apache.lucene.queryparser.flexible.standard.parser; * 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.queryparser.flexible.standard.parser; import java.io.*; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/package-info.java index be72e7f57a3..ff0f78b0ba4 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** *

Lucene Query Parser

*

diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/AllowLeadingWildcardProcessor.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/AllowLeadingWildcardProcessor.java index 85afb5c147e..0ff55185aef 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/AllowLeadingWildcardProcessor.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/AllowLeadingWildcardProcessor.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.processors; - /* * 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.lucene.queryparser.flexible.standard.processors; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.processors; import java.util.List; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/AnalyzerQueryNodeProcessor.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/AnalyzerQueryNodeProcessor.java index 83e973407a4..32e51937f86 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/AnalyzerQueryNodeProcessor.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/AnalyzerQueryNodeProcessor.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.processors; - /* * 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.lucene.queryparser.flexible.standard.processors; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.processors; import java.io.IOException; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/BooleanQuery2ModifierNodeProcessor.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/BooleanQuery2ModifierNodeProcessor.java index 11906d7eee2..afa01331821 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/BooleanQuery2ModifierNodeProcessor.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/BooleanQuery2ModifierNodeProcessor.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.processors; - /* * 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.lucene.queryparser.flexible.standard.processors; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.processors; import java.util.ArrayList; import java.util.List; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/BooleanSingleChildOptimizationQueryNodeProcessor.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/BooleanSingleChildOptimizationQueryNodeProcessor.java index 65c99399549..e241b8dd834 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/BooleanSingleChildOptimizationQueryNodeProcessor.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/BooleanSingleChildOptimizationQueryNodeProcessor.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.processors; - /* * 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.lucene.queryparser.flexible.standard.processors; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.processors; import java.util.List; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/BoostQueryNodeProcessor.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/BoostQueryNodeProcessor.java index b0c455c1fb6..353d087c454 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/BoostQueryNodeProcessor.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/BoostQueryNodeProcessor.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.processors; - /* * 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.lucene.queryparser.flexible.standard.processors; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.processors; import java.util.List; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/DefaultPhraseSlopQueryNodeProcessor.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/DefaultPhraseSlopQueryNodeProcessor.java index f2fc891ce77..fdf2195dad0 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/DefaultPhraseSlopQueryNodeProcessor.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/DefaultPhraseSlopQueryNodeProcessor.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.processors; - /* * 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.lucene.queryparser.flexible.standard.processors; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.processors; import java.util.List; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/FuzzyQueryNodeProcessor.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/FuzzyQueryNodeProcessor.java index a2ffae4c997..0b8a9a72c29 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/FuzzyQueryNodeProcessor.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/FuzzyQueryNodeProcessor.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.processors; - /* * 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.lucene.queryparser.flexible.standard.processors; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.processors; import java.util.List; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/LowercaseExpandedTermsQueryNodeProcessor.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/LowercaseExpandedTermsQueryNodeProcessor.java index f81a40a87e7..3bb207584bb 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/LowercaseExpandedTermsQueryNodeProcessor.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/LowercaseExpandedTermsQueryNodeProcessor.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.processors; - /* * 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.lucene.queryparser.flexible.standard.processors; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.processors; import java.util.List; import java.util.Locale; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/MatchAllDocsQueryNodeProcessor.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/MatchAllDocsQueryNodeProcessor.java index f3c4ec1123c..89a7f82e52a 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/MatchAllDocsQueryNodeProcessor.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/MatchAllDocsQueryNodeProcessor.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.processors; - /* * 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.lucene.queryparser.flexible.standard.processors; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.processors; import java.util.List; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/MultiFieldQueryNodeProcessor.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/MultiFieldQueryNodeProcessor.java index c4e5ed72598..b6e3f7f50bd 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/MultiFieldQueryNodeProcessor.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/MultiFieldQueryNodeProcessor.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.processors; - /* * 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.lucene.queryparser.flexible.standard.processors; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.processors; import java.util.ArrayList; import java.util.LinkedList; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/MultiTermRewriteMethodProcessor.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/MultiTermRewriteMethodProcessor.java index c035903e5ad..a65f6801c7f 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/MultiTermRewriteMethodProcessor.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/MultiTermRewriteMethodProcessor.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.processors; - /* * 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.lucene.queryparser.flexible.standard.processors; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.processors; import java.util.List; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/NumericQueryNodeProcessor.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/NumericQueryNodeProcessor.java index 443a3e008b6..10bd6baf833 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/NumericQueryNodeProcessor.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/NumericQueryNodeProcessor.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.processors; - /* * 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.lucene.queryparser.flexible.standard.processors; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.processors; import java.text.NumberFormat; import java.text.ParseException; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/NumericRangeQueryNodeProcessor.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/NumericRangeQueryNodeProcessor.java index 7710fbc791a..bbe52845299 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/NumericRangeQueryNodeProcessor.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/NumericRangeQueryNodeProcessor.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.processors; - /* * 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.lucene.queryparser.flexible.standard.processors; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.processors; import java.text.NumberFormat; import java.text.ParseException; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/OpenRangeQueryNodeProcessor.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/OpenRangeQueryNodeProcessor.java index 483abef2bb2..190e9888e31 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/OpenRangeQueryNodeProcessor.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/OpenRangeQueryNodeProcessor.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.processors; - /* * 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.lucene.queryparser.flexible.standard.processors; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.processors; import java.util.List; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/PhraseSlopQueryNodeProcessor.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/PhraseSlopQueryNodeProcessor.java index 518e2ca7ba3..bfec9d8faa0 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/PhraseSlopQueryNodeProcessor.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/PhraseSlopQueryNodeProcessor.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.processors; - /* * 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.lucene.queryparser.flexible.standard.processors; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.processors; import java.util.List; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/RemoveEmptyNonLeafQueryNodeProcessor.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/RemoveEmptyNonLeafQueryNodeProcessor.java index ed7d403f06a..ef183d232be 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/RemoveEmptyNonLeafQueryNodeProcessor.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/RemoveEmptyNonLeafQueryNodeProcessor.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.processors; - /* * 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.lucene.queryparser.flexible.standard.processors; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.processors; import java.util.LinkedList; import java.util.List; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/StandardQueryNodeProcessorPipeline.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/StandardQueryNodeProcessorPipeline.java index c0cdfc58882..06f38c2b209 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/StandardQueryNodeProcessorPipeline.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/StandardQueryNodeProcessorPipeline.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.processors; - /* * 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.lucene.queryparser.flexible.standard.processors; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.processors; import java.util.Locale; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/TermRangeQueryNodeProcessor.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/TermRangeQueryNodeProcessor.java index 5cb0b8abbd2..f9a45833bbf 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/TermRangeQueryNodeProcessor.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/TermRangeQueryNodeProcessor.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.processors; - /* * 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.lucene.queryparser.flexible.standard.processors; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.processors; import java.text.DateFormat; import java.util.Calendar; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/WildcardQueryNodeProcessor.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/WildcardQueryNodeProcessor.java index f5a0a610e9a..718257500b7 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/WildcardQueryNodeProcessor.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/WildcardQueryNodeProcessor.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard.processors; - /* * 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.lucene.queryparser.flexible.standard.processors; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard.processors; import java.util.List; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/package-info.java index ec68c7ef975..63be1552640 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Lucene Query Node Processors. * diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/simple/SimpleQueryParser.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/simple/SimpleQueryParser.java index fc104b30f7f..775c7c9a19d 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/simple/SimpleQueryParser.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/simple/SimpleQueryParser.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.simple; - /* * 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.lucene.queryparser.simple; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.simple; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.index.Term; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/simple/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/simple/package-info.java index 926ed1795d5..2217329e42e 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/simple/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/simple/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * A simple query parser for human-entered queries. */ diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/FastCharStream.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/FastCharStream.java index a03377fe6ed..d3cc18bbfec 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/FastCharStream.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/FastCharStream.java @@ -1,5 +1,3 @@ -// FastCharStream.java -package org.apache.lucene.queryparser.surround.parser; /* * 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.lucene.queryparser.surround.parser; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.surround.parser; import java.io.*; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/package-info.java index 78a8e71b794..6bdfecb760a 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * This package contains the QueryParser.jj source file for the Surround parser. *

diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/AndQuery.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/AndQuery.java index 9e080e68ddd..2ed8d796024 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/AndQuery.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/AndQuery.java @@ -1,4 +1,3 @@ -package org.apache.lucene.queryparser.surround.query; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,8 +14,7 @@ package org.apache.lucene.queryparser.surround.query; * See the License for the specific language governing permissions and * limitations under the License. */ - - +package org.apache.lucene.queryparser.surround.query; import java.util.List; import org.apache.lucene.search.Query; import org.apache.lucene.search.BooleanClause; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/BasicQueryFactory.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/BasicQueryFactory.java index 59dab7efc22..4f01a2d36e1 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/BasicQueryFactory.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/BasicQueryFactory.java @@ -1,4 +1,3 @@ -package org.apache.lucene.queryparser.surround.query; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.queryparser.surround.query; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.queryparser.surround.query; /* Create basic queries to be used during rewrite. * The basic queries are TermQuery and SpanTermQuery. * An exception can be thrown when too many of these are used. diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/ComposedQuery.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/ComposedQuery.java index 0874a1f0a1f..e44c41fd029 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/ComposedQuery.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/ComposedQuery.java @@ -1,4 +1,3 @@ -package org.apache.lucene.queryparser.surround.query; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.queryparser.surround.query; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.queryparser.surround.query; import java.util.List; import java.util.ArrayList; import java.util.Iterator; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/DistanceQuery.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/DistanceQuery.java index 62bc6454220..74fd3ae90b1 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/DistanceQuery.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/DistanceQuery.java @@ -1,4 +1,3 @@ -package org.apache.lucene.queryparser.surround.query; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.queryparser.surround.query; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.queryparser.surround.query; import java.util.List; import java.util.Iterator; import java.io.IOException; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/DistanceRewriteQuery.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/DistanceRewriteQuery.java index f54a0b5e3bc..1972a8ecf95 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/DistanceRewriteQuery.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/DistanceRewriteQuery.java @@ -1,4 +1,3 @@ -package org.apache.lucene.queryparser.surround.query; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.queryparser.surround.query; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.queryparser.surround.query; import java.io.IOException; import org.apache.lucene.index.IndexReader; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/DistanceSubQuery.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/DistanceSubQuery.java index ad793c8349f..2ec384d3f1d 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/DistanceSubQuery.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/DistanceSubQuery.java @@ -1,4 +1,3 @@ -package org.apache.lucene.queryparser.surround.query; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.queryparser.surround.query; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.queryparser.surround.query; import java.io.IOException; /** diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/FieldsQuery.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/FieldsQuery.java index e0dfe742695..23bb0952696 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/FieldsQuery.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/FieldsQuery.java @@ -1,4 +1,3 @@ -package org.apache.lucene.queryparser.surround.query; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.queryparser.surround.query; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.queryparser.surround.query; import java.util.ArrayList; import java.util.List; import java.util.Iterator; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/NotQuery.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/NotQuery.java index 288be7feae3..897d3a8e385 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/NotQuery.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/NotQuery.java @@ -1,4 +1,3 @@ -package org.apache.lucene.queryparser.surround.query; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.queryparser.surround.query; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.queryparser.surround.query; import java.util.List; import org.apache.lucene.search.Query; import org.apache.lucene.search.BooleanQuery; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/OrQuery.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/OrQuery.java index 5189218b3e7..76daa19d979 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/OrQuery.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/OrQuery.java @@ -1,4 +1,3 @@ -package org.apache.lucene.queryparser.surround.query; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.queryparser.surround.query; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.queryparser.surround.query; import java.util.List; import java.util.Iterator; import org.apache.lucene.search.Query; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/RewriteQuery.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/RewriteQuery.java index df741756593..90684236c1f 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/RewriteQuery.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/RewriteQuery.java @@ -1,4 +1,3 @@ -package org.apache.lucene.queryparser.surround.query; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.queryparser.surround.query; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.surround.query; import java.io.IOException; import org.apache.lucene.index.IndexReader; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SimpleTerm.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SimpleTerm.java index 00cc4422a28..f574feb9a3b 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SimpleTerm.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SimpleTerm.java @@ -1,4 +1,3 @@ -package org.apache.lucene.queryparser.surround.query; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.queryparser.surround.query; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.queryparser.surround.query; import java.io.IOException; import org.apache.lucene.index.IndexReader; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SimpleTermRewriteQuery.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SimpleTermRewriteQuery.java index 4c62e3d9bec..3e0e4aa1315 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SimpleTermRewriteQuery.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SimpleTermRewriteQuery.java @@ -1,4 +1,3 @@ -package org.apache.lucene.queryparser.surround.query; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.lucene.queryparser.surround.query; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.surround.query; import java.io.IOException; import java.util.List; import java.util.ArrayList; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SpanNearClauseFactory.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SpanNearClauseFactory.java index 0566d043290..2db315f617f 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SpanNearClauseFactory.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SpanNearClauseFactory.java @@ -1,4 +1,3 @@ -package org.apache.lucene.queryparser.surround.query; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.queryparser.surround.query; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.queryparser.surround.query; /* SpanNearClauseFactory: diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndBooleanQuery.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndBooleanQuery.java index 45cb85731e7..501034edd99 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndBooleanQuery.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndBooleanQuery.java @@ -1,4 +1,3 @@ -package org.apache.lucene.queryparser.surround.query; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.queryparser.surround.query; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.queryparser.surround.query; import java.util.List; import org.apache.lucene.search.Query; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndPrefixQuery.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndPrefixQuery.java index c44375bb922..587c4fbe1cf 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndPrefixQuery.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndPrefixQuery.java @@ -1,4 +1,3 @@ -package org.apache.lucene.queryparser.surround.query; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.queryparser.surround.query; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.queryparser.surround.query; import org.apache.lucene.index.Term; import org.apache.lucene.index.Terms; import org.apache.lucene.util.BytesRef; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndQuery.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndQuery.java index cfbb9f4b9ef..4ecb30f6e5f 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndQuery.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndQuery.java @@ -1,4 +1,3 @@ -package org.apache.lucene.queryparser.surround.query; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.queryparser.surround.query; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.queryparser.surround.query; import org.apache.lucene.search.BoostQuery; import org.apache.lucene.search.Query; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndTermQuery.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndTermQuery.java index 2ce49286444..ffa8c783890 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndTermQuery.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndTermQuery.java @@ -1,4 +1,3 @@ -package org.apache.lucene.queryparser.surround.query; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.queryparser.surround.query; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.queryparser.surround.query; import java.io.IOException; import org.apache.lucene.index.IndexReader; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndTruncQuery.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndTruncQuery.java index c8204a7ea02..b9879215673 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndTruncQuery.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SrndTruncQuery.java @@ -1,4 +1,3 @@ -package org.apache.lucene.queryparser.surround.query; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.queryparser.surround.query; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.queryparser.surround.query; import org.apache.lucene.index.Term; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.index.Terms; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/TooManyBasicQueries.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/TooManyBasicQueries.java index 7e5a39d8b8f..cce7b87e16e 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/TooManyBasicQueries.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/TooManyBasicQueries.java @@ -1,4 +1,3 @@ -package org.apache.lucene.queryparser.surround.query; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.queryparser.surround.query; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.queryparser.surround.query; import java.io.IOException; /* subclass to be usable from within Query.rewrite() */ /** diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/package-info.java index d0c7fae8c0e..da9926dcc7b 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * This package contains SrndQuery and its subclasses. *

diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/CoreParser.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/CoreParser.java index 3710f96bae2..6bbb626a750 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/CoreParser.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/CoreParser.java @@ -1,17 +1,3 @@ -package org.apache.lucene.queryparser.xml; - -import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.queryparser.classic.QueryParser; -import org.apache.lucene.queryparser.xml.builders.*; -import org.apache.lucene.search.Query; -import org.w3c.dom.Document; -import org.w3c.dom.Element; - -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; - -import java.io.InputStream; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -28,6 +14,19 @@ import java.io.InputStream; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.xml; + +import org.apache.lucene.analysis.Analyzer; +import org.apache.lucene.queryparser.classic.QueryParser; +import org.apache.lucene.queryparser.xml.builders.*; +import org.apache.lucene.search.Query; +import org.w3c.dom.Document; +import org.w3c.dom.Element; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; + +import java.io.InputStream; /** * Assembles a QueryBuilder which uses only core Lucene Query objects diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/CorePlusExtensionsParser.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/CorePlusExtensionsParser.java index d36a03eee6e..c366ee9e1f5 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/CorePlusExtensionsParser.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/CorePlusExtensionsParser.java @@ -1,9 +1,3 @@ -package org.apache.lucene.queryparser.xml; - -import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.queryparser.classic.QueryParser; -import org.apache.lucene.queryparser.xml.builders.FuzzyLikeThisQueryBuilder; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -20,6 +14,11 @@ import org.apache.lucene.queryparser.xml.builders.FuzzyLikeThisQueryBuilder; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.xml; + +import org.apache.lucene.analysis.Analyzer; +import org.apache.lucene.queryparser.classic.QueryParser; +import org.apache.lucene.queryparser.xml.builders.FuzzyLikeThisQueryBuilder; /** * Assembles a QueryBuilder which uses Query objects from diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/CorePlusQueriesParser.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/CorePlusQueriesParser.java index 023334d7d00..87b5f8f149c 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/CorePlusQueriesParser.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/CorePlusQueriesParser.java @@ -1,10 +1,3 @@ -package org.apache.lucene.queryparser.xml; - -import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.queryparser.classic.QueryParser; -import org.apache.lucene.queryparser.xml.builders.LikeThisQueryBuilder; -import org.apache.lucene.queryparser.xml.builders.BoostingQueryBuilder; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -21,6 +14,12 @@ import org.apache.lucene.queryparser.xml.builders.BoostingQueryBuilder; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.xml; + +import org.apache.lucene.analysis.Analyzer; +import org.apache.lucene.queryparser.classic.QueryParser; +import org.apache.lucene.queryparser.xml.builders.LikeThisQueryBuilder; +import org.apache.lucene.queryparser.xml.builders.BoostingQueryBuilder; /** * Assembles a QueryBuilder which uses Query objects from diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/DOMUtils.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/DOMUtils.java index 9e895b66572..5d98fbaec74 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/DOMUtils.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/DOMUtils.java @@ -1,13 +1,3 @@ -package org.apache.lucene.queryparser.xml; - -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.xml.sax.InputSource; - -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import java.io.Reader; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -24,7 +14,16 @@ import java.io.Reader; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.xml; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.xml.sax.InputSource; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import java.io.Reader; /** * Helper methods for parsing XML */ diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/ParserException.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/ParserException.java index 96b261f6923..d55932c974e 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/ParserException.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/ParserException.java @@ -1,7 +1,3 @@ -/* - * Created on 25-Jan-2006 - */ -package org.apache.lucene.queryparser.xml; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,7 @@ package org.apache.lucene.queryparser.xml; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.xml; /** * Thrown when the xml queryparser encounters diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryBuilder.java index eff70d35c7d..663b81d5c22 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryBuilder.java @@ -1,7 +1,3 @@ -package org.apache.lucene.queryparser.xml; - -import org.apache.lucene.search.Query; -import org.w3c.dom.Element; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,10 @@ import org.w3c.dom.Element; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.xml; + +import org.apache.lucene.search.Query; +import org.w3c.dom.Element; /** * Implemented by objects that produce Lucene Query objects from XML streams. Implementations are * expected to be thread-safe so that they can be used to simultaneously parse multiple XML documents. diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryBuilderFactory.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryBuilderFactory.java index 94ab8f8b466..5b9d5f3190b 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryBuilderFactory.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryBuilderFactory.java @@ -1,12 +1,3 @@ -/* - * Created on 25-Jan-2006 - */ -package org.apache.lucene.queryparser.xml; - -import org.apache.lucene.search.Query; -import org.w3c.dom.Element; - -import java.util.HashMap; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -23,6 +14,12 @@ import java.util.HashMap; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.xml; + +import org.apache.lucene.search.Query; +import org.w3c.dom.Element; + +import java.util.HashMap; /** * Factory for {@link QueryBuilder} diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryTemplateManager.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryTemplateManager.java index d3e5e81ef67..d454b2806d8 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryTemplateManager.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryTemplateManager.java @@ -1,3 +1,19 @@ +/* + * 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.queryparser.xml; import org.w3c.dom.Document; @@ -18,23 +34,6 @@ import java.util.Enumeration; import java.util.HashMap; import java.util.Properties; -/* - * 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. - */ - /** * Provides utilities for turning query form input (such as from a web page or Swing gui) into * Lucene XML queries by using XSL templates. This approach offers a convenient way of externalizing diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BooleanQueryBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BooleanQueryBuilder.java index b89f6365133..1dd859cc3ef 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BooleanQueryBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BooleanQueryBuilder.java @@ -1,18 +1,3 @@ -/* - * Created on 25-Jan-2006 - */ -package org.apache.lucene.queryparser.xml.builders; - -import org.apache.lucene.search.BooleanClause; -import org.apache.lucene.search.BooleanQuery; -import org.apache.lucene.search.BoostQuery; -import org.apache.lucene.search.Query; -import org.apache.lucene.queryparser.xml.DOMUtils; -import org.apache.lucene.queryparser.xml.ParserException; -import org.apache.lucene.queryparser.xml.QueryBuilder; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -29,6 +14,18 @@ import org.w3c.dom.NodeList; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.xml.builders; + +import org.apache.lucene.search.BooleanClause; +import org.apache.lucene.search.BooleanQuery; +import org.apache.lucene.search.BoostQuery; +import org.apache.lucene.search.Query; +import org.apache.lucene.queryparser.xml.DOMUtils; +import org.apache.lucene.queryparser.xml.ParserException; +import org.apache.lucene.queryparser.xml.QueryBuilder; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; /** * Builder for {@link BooleanQuery} diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BoostingQueryBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BoostingQueryBuilder.java index f5fc5232106..f58804b8b2b 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BoostingQueryBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BoostingQueryBuilder.java @@ -1,12 +1,3 @@ -package org.apache.lucene.queryparser.xml.builders; - -import org.apache.lucene.queries.BoostingQuery; -import org.apache.lucene.search.BoostQuery; -import org.apache.lucene.search.Query; -import org.apache.lucene.queryparser.xml.DOMUtils; -import org.apache.lucene.queryparser.xml.ParserException; -import org.apache.lucene.queryparser.xml.QueryBuilder; -import org.w3c.dom.Element; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -23,7 +14,15 @@ import org.w3c.dom.Element; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.xml.builders; +import org.apache.lucene.queries.BoostingQuery; +import org.apache.lucene.search.BoostQuery; +import org.apache.lucene.search.Query; +import org.apache.lucene.queryparser.xml.DOMUtils; +import org.apache.lucene.queryparser.xml.ParserException; +import org.apache.lucene.queryparser.xml.QueryBuilder; +import org.w3c.dom.Element; /** * Builder for {@link BoostingQuery} */ diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BoostingTermBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BoostingTermBuilder.java index 08ea9735018..3c9668e966d 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BoostingTermBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BoostingTermBuilder.java @@ -1,15 +1,3 @@ -package org.apache.lucene.queryparser.xml.builders; - -import org.apache.lucene.index.Term; -import org.apache.lucene.queryparser.xml.DOMUtils; -import org.apache.lucene.queryparser.xml.ParserException; -import org.apache.lucene.queries.payloads.AveragePayloadFunction; -import org.apache.lucene.queries.payloads.PayloadScoreQuery; -import org.apache.lucene.search.spans.SpanBoostQuery; -import org.apache.lucene.search.spans.SpanQuery; -import org.apache.lucene.search.spans.SpanTermQuery; -import org.w3c.dom.Element; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -26,6 +14,17 @@ import org.w3c.dom.Element; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.xml.builders; + +import org.apache.lucene.index.Term; +import org.apache.lucene.queryparser.xml.DOMUtils; +import org.apache.lucene.queryparser.xml.ParserException; +import org.apache.lucene.queries.payloads.AveragePayloadFunction; +import org.apache.lucene.queries.payloads.PayloadScoreQuery; +import org.apache.lucene.search.spans.SpanBoostQuery; +import org.apache.lucene.search.spans.SpanQuery; +import org.apache.lucene.search.spans.SpanTermQuery; +import org.w3c.dom.Element; /** * Builder for {@link PayloadScoreQuery} diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/ConstantScoreQueryBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/ConstantScoreQueryBuilder.java index ef618471405..7521514d971 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/ConstantScoreQueryBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/ConstantScoreQueryBuilder.java @@ -1,13 +1,3 @@ -package org.apache.lucene.queryparser.xml.builders; - -import org.apache.lucene.queryparser.xml.DOMUtils; -import org.apache.lucene.queryparser.xml.ParserException; -import org.apache.lucene.queryparser.xml.QueryBuilder; -import org.apache.lucene.queryparser.xml.QueryBuilderFactory; -import org.apache.lucene.search.BoostQuery; -import org.apache.lucene.search.ConstantScoreQuery; -import org.apache.lucene.search.Query; -import org.w3c.dom.Element; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -24,7 +14,16 @@ import org.w3c.dom.Element; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.xml.builders; +import org.apache.lucene.queryparser.xml.DOMUtils; +import org.apache.lucene.queryparser.xml.ParserException; +import org.apache.lucene.queryparser.xml.QueryBuilder; +import org.apache.lucene.queryparser.xml.QueryBuilderFactory; +import org.apache.lucene.search.BoostQuery; +import org.apache.lucene.search.ConstantScoreQuery; +import org.apache.lucene.search.Query; +import org.w3c.dom.Element; /** * Builder for {@link ConstantScoreQuery} */ diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/DisjunctionMaxQueryBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/DisjunctionMaxQueryBuilder.java index 70bdc98baa7..849066795f4 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/DisjunctionMaxQueryBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/DisjunctionMaxQueryBuilder.java @@ -1,4 +1,3 @@ -package org.apache.lucene.queryparser.xml.builders; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.queryparser.xml.builders; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.queryparser.xml.builders; import java.util.ArrayList; import java.util.List; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/FuzzyLikeThisQueryBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/FuzzyLikeThisQueryBuilder.java index 7592251ab80..f969a66480b 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/FuzzyLikeThisQueryBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/FuzzyLikeThisQueryBuilder.java @@ -1,16 +1,3 @@ -package org.apache.lucene.queryparser.xml.builders; - -import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.queryparser.xml.DOMUtils; -import org.apache.lucene.queryparser.xml.ParserException; -import org.apache.lucene.queryparser.xml.QueryBuilder; -import org.apache.lucene.sandbox.queries.FuzzyLikeThisQuery; -import org.apache.lucene.sandbox.queries.SlowFuzzyQuery; -import org.apache.lucene.search.BoostQuery; -import org.apache.lucene.search.Query; -import org.w3c.dom.Element; -import org.w3c.dom.NodeList; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -27,6 +14,18 @@ import org.w3c.dom.NodeList; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.xml.builders; + +import org.apache.lucene.analysis.Analyzer; +import org.apache.lucene.queryparser.xml.DOMUtils; +import org.apache.lucene.queryparser.xml.ParserException; +import org.apache.lucene.queryparser.xml.QueryBuilder; +import org.apache.lucene.sandbox.queries.FuzzyLikeThisQuery; +import org.apache.lucene.sandbox.queries.SlowFuzzyQuery; +import org.apache.lucene.search.BoostQuery; +import org.apache.lucene.search.Query; +import org.w3c.dom.Element; +import org.w3c.dom.NodeList; /** * Builder for {@link FuzzyLikeThisQuery} diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/LegacyNumericRangeQueryBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/LegacyNumericRangeQueryBuilder.java index 8a02916de4f..2aba681347f 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/LegacyNumericRangeQueryBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/LegacyNumericRangeQueryBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.xml.builders; - /* * 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.lucene.queryparser.xml.builders; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.xml.builders; import org.apache.lucene.search.LegacyNumericRangeQuery; import org.apache.lucene.search.Query; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/LikeThisQueryBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/LikeThisQueryBuilder.java index 98dfc3ccfe4..2812043c50a 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/LikeThisQueryBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/LikeThisQueryBuilder.java @@ -1,5 +1,18 @@ /* - * Created on 25-Jan-2006 + * 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.queryparser.xml.builders; @@ -17,22 +30,6 @@ import org.apache.lucene.search.Query; import org.apache.lucene.queryparser.xml.DOMUtils; import org.apache.lucene.queryparser.xml.ParserException; import org.w3c.dom.Element; -/* - * 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. - */ /** * Builder for {@link MoreLikeThisQuery} diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/MatchAllDocsQueryBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/MatchAllDocsQueryBuilder.java index 36c071c1ebe..92c28921a72 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/MatchAllDocsQueryBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/MatchAllDocsQueryBuilder.java @@ -1,10 +1,3 @@ -package org.apache.lucene.queryparser.xml.builders; - -import org.apache.lucene.search.MatchAllDocsQuery; -import org.apache.lucene.search.Query; -import org.apache.lucene.queryparser.xml.ParserException; -import org.apache.lucene.queryparser.xml.QueryBuilder; -import org.w3c.dom.Element; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -21,7 +14,13 @@ import org.w3c.dom.Element; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.xml.builders; +import org.apache.lucene.search.MatchAllDocsQuery; +import org.apache.lucene.search.Query; +import org.apache.lucene.queryparser.xml.ParserException; +import org.apache.lucene.queryparser.xml.QueryBuilder; +import org.w3c.dom.Element; /** * Builder for {@link MatchAllDocsQuery} */ diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/RangeQueryBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/RangeQueryBuilder.java index 7b683c01444..8b054245d4e 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/RangeQueryBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/RangeQueryBuilder.java @@ -1,8 +1,3 @@ -/* - * Created on 25-Jan-2006 - */ -package org.apache.lucene.queryparser.xml.builders; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -19,6 +14,7 @@ package org.apache.lucene.queryparser.xml.builders; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.xml.builders; import org.apache.lucene.queryparser.xml.DOMUtils; import org.apache.lucene.queryparser.xml.ParserException; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanBuilderBase.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanBuilderBase.java index d1c4531f8dc..48b7450aede 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanBuilderBase.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanBuilderBase.java @@ -1,9 +1,3 @@ -package org.apache.lucene.queryparser.xml.builders; - -import org.apache.lucene.search.Query; -import org.apache.lucene.search.spans.SpanQuery; // javadocs -import org.apache.lucene.queryparser.xml.ParserException; -import org.w3c.dom.Element; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -20,7 +14,12 @@ import org.w3c.dom.Element; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.xml.builders; +import org.apache.lucene.search.Query; +import org.apache.lucene.search.spans.SpanQuery; // javadocs +import org.apache.lucene.queryparser.xml.ParserException; +import org.w3c.dom.Element; /** * Base class for building {@link SpanQuery}s */ diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanFirstBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanFirstBuilder.java index dccec2f587f..52475113830 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanFirstBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanFirstBuilder.java @@ -1,11 +1,3 @@ -package org.apache.lucene.queryparser.xml.builders; - -import org.apache.lucene.search.spans.SpanBoostQuery; -import org.apache.lucene.search.spans.SpanFirstQuery; -import org.apache.lucene.search.spans.SpanQuery; -import org.apache.lucene.queryparser.xml.DOMUtils; -import org.apache.lucene.queryparser.xml.ParserException; -import org.w3c.dom.Element; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -22,7 +14,14 @@ import org.w3c.dom.Element; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.xml.builders; +import org.apache.lucene.search.spans.SpanBoostQuery; +import org.apache.lucene.search.spans.SpanFirstQuery; +import org.apache.lucene.search.spans.SpanQuery; +import org.apache.lucene.queryparser.xml.DOMUtils; +import org.apache.lucene.queryparser.xml.ParserException; +import org.w3c.dom.Element; /** * Builder for {@link SpanFirstQuery} */ diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanNearBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanNearBuilder.java index d81953a3262..c6b6c813b41 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanNearBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanNearBuilder.java @@ -1,15 +1,3 @@ -package org.apache.lucene.queryparser.xml.builders; - -import org.apache.lucene.search.spans.SpanBoostQuery; -import org.apache.lucene.search.spans.SpanNearQuery; -import org.apache.lucene.search.spans.SpanQuery; -import org.apache.lucene.queryparser.xml.DOMUtils; -import org.apache.lucene.queryparser.xml.ParserException; -import org.w3c.dom.Element; -import org.w3c.dom.Node; - -import java.util.ArrayList; -import java.util.List; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -26,7 +14,18 @@ import java.util.List; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.xml.builders; +import org.apache.lucene.search.spans.SpanBoostQuery; +import org.apache.lucene.search.spans.SpanNearQuery; +import org.apache.lucene.search.spans.SpanQuery; +import org.apache.lucene.queryparser.xml.DOMUtils; +import org.apache.lucene.queryparser.xml.ParserException; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + +import java.util.ArrayList; +import java.util.List; /** * Builder for {@link SpanNearQuery} */ diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanNotBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanNotBuilder.java index 1a9b7846285..9bac89db7f4 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanNotBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanNotBuilder.java @@ -1,11 +1,3 @@ -package org.apache.lucene.queryparser.xml.builders; - -import org.apache.lucene.search.spans.SpanBoostQuery; -import org.apache.lucene.search.spans.SpanNotQuery; -import org.apache.lucene.search.spans.SpanQuery; -import org.apache.lucene.queryparser.xml.DOMUtils; -import org.apache.lucene.queryparser.xml.ParserException; -import org.w3c.dom.Element; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -22,7 +14,14 @@ import org.w3c.dom.Element; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.xml.builders; +import org.apache.lucene.search.spans.SpanBoostQuery; +import org.apache.lucene.search.spans.SpanNotQuery; +import org.apache.lucene.search.spans.SpanQuery; +import org.apache.lucene.queryparser.xml.DOMUtils; +import org.apache.lucene.queryparser.xml.ParserException; +import org.w3c.dom.Element; /** * Builder for {@link SpanNotQuery} */ diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanOrBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanOrBuilder.java index 367754bb17a..a5d5f6a9934 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanOrBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanOrBuilder.java @@ -1,15 +1,3 @@ -package org.apache.lucene.queryparser.xml.builders; - -import org.apache.lucene.search.spans.SpanBoostQuery; -import org.apache.lucene.search.spans.SpanOrQuery; -import org.apache.lucene.search.spans.SpanQuery; -import org.apache.lucene.queryparser.xml.DOMUtils; -import org.apache.lucene.queryparser.xml.ParserException; -import org.w3c.dom.Element; -import org.w3c.dom.Node; - -import java.util.ArrayList; -import java.util.List; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -26,7 +14,18 @@ import java.util.List; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.xml.builders; +import org.apache.lucene.search.spans.SpanBoostQuery; +import org.apache.lucene.search.spans.SpanOrQuery; +import org.apache.lucene.search.spans.SpanQuery; +import org.apache.lucene.queryparser.xml.DOMUtils; +import org.apache.lucene.queryparser.xml.ParserException; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + +import java.util.ArrayList; +import java.util.List; /** * Builder for {@link SpanOrQuery} */ diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanOrTermsBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanOrTermsBuilder.java index 785b644d880..d30653e2982 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanOrTermsBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanOrTermsBuilder.java @@ -1,3 +1,19 @@ +/* + * 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.queryparser.xml.builders; import org.apache.lucene.analysis.Analyzer; @@ -17,23 +33,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -/* - * 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. - */ - /** * Builder that analyzes the text into a {@link SpanOrQuery} */ diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanQueryBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanQueryBuilder.java index 1b694f3c0ae..74d03b33304 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanQueryBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanQueryBuilder.java @@ -1,4 +1,3 @@ -package org.apache.lucene.queryparser.xml.builders; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.queryparser.xml.builders; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.queryparser.xml.builders; import org.apache.lucene.search.spans.SpanQuery; import org.apache.lucene.queryparser.xml.ParserException; import org.apache.lucene.queryparser.xml.QueryBuilder; diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanQueryBuilderFactory.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanQueryBuilderFactory.java index 69fd7ba2fdd..6f41428c6a8 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanQueryBuilderFactory.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanQueryBuilderFactory.java @@ -1,12 +1,3 @@ -package org.apache.lucene.queryparser.xml.builders; - -import org.apache.lucene.search.Query; -import org.apache.lucene.search.spans.SpanQuery; -import org.apache.lucene.queryparser.xml.ParserException; -import org.w3c.dom.Element; - -import java.util.HashMap; -import java.util.Map; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -23,7 +14,15 @@ import java.util.Map; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.xml.builders; +import org.apache.lucene.search.Query; +import org.apache.lucene.search.spans.SpanQuery; +import org.apache.lucene.queryparser.xml.ParserException; +import org.w3c.dom.Element; + +import java.util.HashMap; +import java.util.Map; /** * Factory for {@link SpanQueryBuilder}s */ diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanTermBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanTermBuilder.java index 9148ef88e5f..560a8accf02 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanTermBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanTermBuilder.java @@ -1,12 +1,3 @@ -package org.apache.lucene.queryparser.xml.builders; - -import org.apache.lucene.index.Term; -import org.apache.lucene.search.spans.SpanBoostQuery; -import org.apache.lucene.search.spans.SpanQuery; -import org.apache.lucene.search.spans.SpanTermQuery; -import org.apache.lucene.queryparser.xml.DOMUtils; -import org.apache.lucene.queryparser.xml.ParserException; -import org.w3c.dom.Element; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -23,7 +14,15 @@ import org.w3c.dom.Element; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.xml.builders; +import org.apache.lucene.index.Term; +import org.apache.lucene.search.spans.SpanBoostQuery; +import org.apache.lucene.search.spans.SpanQuery; +import org.apache.lucene.search.spans.SpanTermQuery; +import org.apache.lucene.queryparser.xml.DOMUtils; +import org.apache.lucene.queryparser.xml.ParserException; +import org.w3c.dom.Element; /** * Builder for {@link SpanTermQuery} */ diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/TermQueryBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/TermQueryBuilder.java index 8751eb39ac7..221c596d1e0 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/TermQueryBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/TermQueryBuilder.java @@ -1,13 +1,3 @@ -package org.apache.lucene.queryparser.xml.builders; - -import org.apache.lucene.index.Term; -import org.apache.lucene.search.BoostQuery; -import org.apache.lucene.search.Query; -import org.apache.lucene.search.TermQuery; -import org.apache.lucene.queryparser.xml.DOMUtils; -import org.apache.lucene.queryparser.xml.ParserException; -import org.apache.lucene.queryparser.xml.QueryBuilder; -import org.w3c.dom.Element; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -24,7 +14,16 @@ import org.w3c.dom.Element; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.xml.builders; +import org.apache.lucene.index.Term; +import org.apache.lucene.search.BoostQuery; +import org.apache.lucene.search.Query; +import org.apache.lucene.search.TermQuery; +import org.apache.lucene.queryparser.xml.DOMUtils; +import org.apache.lucene.queryparser.xml.ParserException; +import org.apache.lucene.queryparser.xml.QueryBuilder; +import org.w3c.dom.Element; /** * Builder for {@link TermQuery} */ diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/TermsQueryBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/TermsQueryBuilder.java index 70085561be2..7fb84cd6e2a 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/TermsQueryBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/TermsQueryBuilder.java @@ -1,3 +1,19 @@ +/* + * 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.queryparser.xml.builders; import org.apache.lucene.analysis.Analyzer; @@ -17,23 +33,6 @@ import org.w3c.dom.Element; import java.io.IOException; -/* - * 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. - */ - /** * Builds a BooleanQuery from all of the terms found in the XML element using the choice of analyzer */ diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/UserInputQueryBuilder.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/UserInputQueryBuilder.java index 09a7afd8831..ea446429a10 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/UserInputQueryBuilder.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/UserInputQueryBuilder.java @@ -1,15 +1,3 @@ -package org.apache.lucene.queryparser.xml.builders; - -import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.queryparser.classic.ParseException; -import org.apache.lucene.queryparser.classic.QueryParser; -import org.apache.lucene.search.BoostQuery; -import org.apache.lucene.search.Query; -import org.apache.lucene.queryparser.xml.DOMUtils; -import org.apache.lucene.queryparser.xml.ParserException; -import org.apache.lucene.queryparser.xml.QueryBuilder; -import org.w3c.dom.Element; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -26,6 +14,17 @@ import org.w3c.dom.Element; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.xml.builders; + +import org.apache.lucene.analysis.Analyzer; +import org.apache.lucene.queryparser.classic.ParseException; +import org.apache.lucene.queryparser.classic.QueryParser; +import org.apache.lucene.search.BoostQuery; +import org.apache.lucene.search.Query; +import org.apache.lucene.queryparser.xml.DOMUtils; +import org.apache.lucene.queryparser.xml.ParserException; +import org.apache.lucene.queryparser.xml.QueryBuilder; +import org.w3c.dom.Element; /** * UserInputQueryBuilder uses 1 of 2 strategies for thread-safe parsing: diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/package-info.java index 0d570fb86ae..f252786d052 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * XML Parser factories for different Lucene Query/Filters. */ diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/package-info.java index 2b1abee54f3..107ac9aca02 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Parser that produces Lucene Query objects from XML streams. */ diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/analyzing/TestAnalyzingQueryParser.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/analyzing/TestAnalyzingQueryParser.java index 722e748ddcc..2f72e070aeb 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/analyzing/TestAnalyzingQueryParser.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/analyzing/TestAnalyzingQueryParser.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.analyzing; - /* * 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.lucene.queryparser.analyzing; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.analyzing; import java.io.IOException; import java.util.Map; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiAnalyzer.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiAnalyzer.java index 5d256e97afc..9fe2367c2e5 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiAnalyzer.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.classic; - /* * 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.lucene.queryparser.classic; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.classic; import java.io.IOException; import java.io.Reader; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java index f96880478fa..4e7cb545151 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.classic; - /* * 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.lucene.queryparser.classic; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.classic; import java.io.Reader; import java.io.StringReader; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiPhraseQueryParsing.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiPhraseQueryParsing.java index 73c6c34ad20..709f3c38739 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiPhraseQueryParsing.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiPhraseQueryParsing.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.classic; - /* * 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.lucene.queryparser.classic; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.classic; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.Tokenizer; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestQueryParser.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestQueryParser.java index da1b574f95e..5d3b7ecf82b 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestQueryParser.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestQueryParser.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.classic; - /* * 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.lucene.queryparser.classic; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.classic; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.MockAnalyzer; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java index 61ac0379dff..45d13de9b98 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/complexPhrase/TestComplexPhraseQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.complexPhrase; - /* * 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.lucene.queryparser.complexPhrase; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.complexPhrase; import java.util.HashSet; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/ext/ExtensionStub.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/ext/ExtensionStub.java index 1fe3eeca2e1..2897b0fc729 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/ext/ExtensionStub.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/ext/ExtensionStub.java @@ -1,10 +1,3 @@ -package org.apache.lucene.queryparser.ext; - -import org.apache.lucene.index.Term; -import org.apache.lucene.queryparser.classic.ParseException; -import org.apache.lucene.search.Query; -import org.apache.lucene.search.TermQuery; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -21,6 +14,12 @@ import org.apache.lucene.search.TermQuery; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.ext; + +import org.apache.lucene.index.Term; +import org.apache.lucene.queryparser.classic.ParseException; +import org.apache.lucene.search.Query; +import org.apache.lucene.search.TermQuery; class ExtensionStub extends ParserExtension { diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/ext/TestExtendableQueryParser.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/ext/TestExtendableQueryParser.java index ce573dc2dac..ac469308496 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/ext/TestExtendableQueryParser.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/ext/TestExtendableQueryParser.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.ext; - /* * 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.lucene.queryparser.ext; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.ext; import java.util.Locale; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/ext/TestExtensions.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/ext/TestExtensions.java index 81af93ad1b7..fde11bbbb0f 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/ext/TestExtensions.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/ext/TestExtensions.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.ext; - /* * 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.lucene.queryparser.ext; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.ext; import org.apache.lucene.util.LuceneTestCase; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/core/builders/TestQueryTreeBuilder.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/core/builders/TestQueryTreeBuilder.java index e837a53868b..be1eb2457ed 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/core/builders/TestQueryTreeBuilder.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/core/builders/TestQueryTreeBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.builders; - /* * 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.lucene.queryparser.flexible.core.builders; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.builders; import junit.framework.Assert; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/core/nodes/TestQueryNode.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/core/nodes/TestQueryNode.java index 2b9ba7904d6..b10d15f5c89 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/core/nodes/TestQueryNode.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/core/nodes/TestQueryNode.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.core.nodes; - /* * 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.lucene.queryparser.flexible.core.nodes; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.core.nodes; import java.util.Arrays; import java.util.Collections; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/messages/MessagesTestBundle.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/messages/MessagesTestBundle.java index 8a6627a85ff..0da60d41677 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/messages/MessagesTestBundle.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/messages/MessagesTestBundle.java @@ -1,21 +1,20 @@ -package org.apache.lucene.queryparser.flexible.messages; - /* * 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 - * + * 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. + * 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.queryparser.flexible.messages; public class MessagesTestBundle extends NLS { diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/messages/TestNLS.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/messages/TestNLS.java index 3b3d2e0ac3e..611e917ea02 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/messages/TestNLS.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/messages/TestNLS.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.messages; - /* * 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.lucene.queryparser.flexible.messages; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.messages; import java.util.Locale; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/precedence/TestPrecedenceQueryParser.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/precedence/TestPrecedenceQueryParser.java index 1075df43eb5..4dbe3f9e0d7 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/precedence/TestPrecedenceQueryParser.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/precedence/TestPrecedenceQueryParser.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.precedence; - /* * 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.lucene.queryparser.flexible.precedence; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.precedence; import java.io.IOException; import java.io.Reader; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpanOrQueryNodeBuilder.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpanOrQueryNodeBuilder.java index 8eac6e451c5..aa21a274784 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpanOrQueryNodeBuilder.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpanOrQueryNodeBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.spans; - /* * 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.lucene.queryparser.flexible.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.spans; import java.util.List; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpanTermQueryNodeBuilder.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpanTermQueryNodeBuilder.java index e6aef516ac7..d498308dd8e 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpanTermQueryNodeBuilder.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpanTermQueryNodeBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.spans; - /* * 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.lucene.queryparser.flexible.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.spans; import org.apache.lucene.index.Term; import org.apache.lucene.queryparser.flexible.core.QueryNodeException; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpansQueryConfigHandler.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpansQueryConfigHandler.java index a04bb16aec2..0d0a2ce2bc5 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpansQueryConfigHandler.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpansQueryConfigHandler.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.spans; - /* * 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.lucene.queryparser.flexible.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.spans; import org.apache.lucene.queryparser.flexible.core.config.ConfigurationKey; import org.apache.lucene.queryparser.flexible.core.config.FieldConfig; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpansQueryTreeBuilder.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpansQueryTreeBuilder.java index 40938197b0b..7ad2c0df32f 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpansQueryTreeBuilder.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpansQueryTreeBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.spans; - /* * 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.lucene.queryparser.flexible.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.spans; import org.apache.lucene.queryparser.flexible.core.QueryNodeException; import org.apache.lucene.queryparser.flexible.core.builders.QueryTreeBuilder; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpansValidatorQueryNodeProcessor.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpansValidatorQueryNodeProcessor.java index 66827e825cd..bc67dadf82d 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpansValidatorQueryNodeProcessor.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/SpansValidatorQueryNodeProcessor.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.spans; - /* * 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.lucene.queryparser.flexible.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.spans; import java.util.List; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/TestSpanQueryParser.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/TestSpanQueryParser.java index 7197e9d2bbd..192cd3bbffe 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/TestSpanQueryParser.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/TestSpanQueryParser.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.spans; - /* * 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.lucene.queryparser.flexible.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.spans; import org.apache.lucene.queryparser.flexible.core.QueryNodeException; import org.apache.lucene.queryparser.flexible.core.nodes.OrQueryNode; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/TestSpanQueryParserSimpleSample.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/TestSpanQueryParserSimpleSample.java index 11a784ace2f..65bb72ba2b9 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/TestSpanQueryParserSimpleSample.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/TestSpanQueryParserSimpleSample.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.spans; - /* * 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.lucene.queryparser.flexible.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.spans; import org.apache.lucene.queryparser.flexible.core.config.QueryConfigHandler; import org.apache.lucene.queryparser.flexible.core.nodes.OrQueryNode; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/UniqueFieldAttribute.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/UniqueFieldAttribute.java index c078c4d6237..79824b2baa9 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/UniqueFieldAttribute.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/UniqueFieldAttribute.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.spans; - /* * 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.lucene.queryparser.flexible.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.spans; import org.apache.lucene.queryparser.flexible.core.nodes.FieldableNode; import org.apache.lucene.util.Attribute; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/UniqueFieldAttributeImpl.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/UniqueFieldAttributeImpl.java index d2ab423d856..5530858195c 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/UniqueFieldAttributeImpl.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/UniqueFieldAttributeImpl.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.spans; - /* * 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.lucene.queryparser.flexible.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.spans; import org.apache.lucene.queryparser.flexible.core.nodes.FieldableNode; import org.apache.lucene.util.AttributeImpl; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/UniqueFieldQueryNodeProcessor.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/UniqueFieldQueryNodeProcessor.java index 8595400fbdf..e8de240ecec 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/UniqueFieldQueryNodeProcessor.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/spans/UniqueFieldQueryNodeProcessor.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.spans; - /* * 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.lucene.queryparser.flexible.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.spans; import java.util.List; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiAnalyzerQPHelper.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiAnalyzerQPHelper.java index 1902df260e8..0f941d0e8d3 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiAnalyzerQPHelper.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiAnalyzerQPHelper.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard; - /* * 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.lucene.queryparser.flexible.standard; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard; import java.io.IOException; import java.io.Reader; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiFieldQPHelper.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiFieldQPHelper.java index e0d496dd496..0988e56d7da 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiFieldQPHelper.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestMultiFieldQPHelper.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard; - /* * 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.lucene.queryparser.flexible.standard; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard; import java.io.Reader; import java.io.StringReader; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestNumericQueryParser.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestNumericQueryParser.java index c1351b4b5cb..c29573b89a6 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestNumericQueryParser.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestNumericQueryParser.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard; - /* * 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.lucene.queryparser.flexible.standard; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard; import java.io.IOException; import java.text.DateFormat; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java index bb9e255cce1..1c53726a3a3 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestQPHelper.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard; - /* * 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.lucene.queryparser.flexible.standard; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard; import java.io.IOException; import java.text.DateFormat; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestStandardQP.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestStandardQP.java index 13e3f0ae5fb..1bbdb53bb42 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestStandardQP.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestStandardQP.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.flexible.standard; - /* * 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.lucene.queryparser.flexible.standard; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.flexible.standard; import java.io.Reader; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/simple/TestSimpleQueryParser.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/simple/TestSimpleQueryParser.java index b03fb4fbcad..3fdde3024af 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/simple/TestSimpleQueryParser.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/simple/TestSimpleQueryParser.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.simple; - /* * 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.lucene.queryparser.simple; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.simple; import java.util.Collections; import java.util.LinkedHashMap; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/BooleanQueryTst.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/BooleanQueryTst.java index baa5782df7f..77ce5d5500f 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/BooleanQueryTst.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/BooleanQueryTst.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.surround.query; - /* * 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.lucene.queryparser.surround.query; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.surround.query; import java.io.IOException; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/ExceptionQueryTst.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/ExceptionQueryTst.java index 99e2e0cad79..b54f68d29a1 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/ExceptionQueryTst.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/ExceptionQueryTst.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.surround.query; - /* * 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.lucene.queryparser.surround.query; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.surround.query; import org.apache.lucene.queryparser.surround.parser.ParseException; import org.apache.lucene.queryparser.surround.parser.QueryParser; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/SingleFieldTestDb.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/SingleFieldTestDb.java index 647f503cbfb..30a5f925947 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/SingleFieldTestDb.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/SingleFieldTestDb.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.surround.query; - /* * 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.lucene.queryparser.surround.query; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.surround.query; import java.util.Random; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/SrndQueryTest.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/SrndQueryTest.java index 910c7e0f270..b1b7ef93bc0 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/SrndQueryTest.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/SrndQueryTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.surround.query; - /* * 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.lucene.queryparser.surround.query; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.surround.query; import org.apache.lucene.queryparser.surround.parser.QueryParser; import org.apache.lucene.search.Query; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test01Exceptions.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test01Exceptions.java index 3e79d22e989..f61ebd220df 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test01Exceptions.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test01Exceptions.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.surround.query; - /* * 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.lucene.queryparser.surround.query; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.surround.query; import junit.framework.TestSuite; import junit.textui.TestRunner; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test02Boolean.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test02Boolean.java index 563506ae968..298dbdc72d0 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test02Boolean.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test02Boolean.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.surround.query; - /* * 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.lucene.queryparser.surround.query; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.surround.query; import junit.framework.TestSuite; import junit.textui.TestRunner; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test03Distance.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test03Distance.java index b14e5907967..9dca811b438 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test03Distance.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/surround/query/Test03Distance.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.surround.query; - /* * 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.lucene.queryparser.surround.query; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.surround.query; import junit.framework.TestSuite; import junit.textui.TestRunner; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java index e134d84f3d7..70dc15a7cfe 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/util/QueryParserTestBase.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.util; - /* * 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.lucene.queryparser.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.util; import java.io.IOException; import java.text.DateFormat; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestCoreParser.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestCoreParser.java index bd8bc833f1b..e675723e320 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestCoreParser.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestCoreParser.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.xml; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -7,15 +5,16 @@ package org.apache.lucene.queryparser.xml; * 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 - * + * + * 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.queryparser.xml; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.MockAnalyzer; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestCorePlusExtensionsParser.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestCorePlusExtensionsParser.java index 4af97bd4abf..23cfb5057a0 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestCorePlusExtensionsParser.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestCorePlusExtensionsParser.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.xml; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -7,15 +5,16 @@ package org.apache.lucene.queryparser.xml; * 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 - * + * + * 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.queryparser.xml; import org.apache.lucene.search.Query; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestCorePlusQueriesParser.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestCorePlusQueriesParser.java index efb566fb304..d87d40b7701 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestCorePlusQueriesParser.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestCorePlusQueriesParser.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.xml; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -7,15 +5,16 @@ package org.apache.lucene.queryparser.xml; * 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 - * + * + * 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.queryparser.xml; import org.apache.lucene.search.Query; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestQueryTemplateManager.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestQueryTemplateManager.java index 7d4caacb46d..0b88b0d5ef9 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestQueryTemplateManager.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestQueryTemplateManager.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.xml; - /* * 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.lucene.queryparser.xml; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.xml; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.MockAnalyzer; diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/builders/TestNumericRangeQueryBuilder.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/builders/TestNumericRangeQueryBuilder.java index c3a2d1b8c85..8fc0641e4e7 100644 --- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/builders/TestNumericRangeQueryBuilder.java +++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/builders/TestNumericRangeQueryBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.queryparser.xml.builders; - /* * 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.lucene.queryparser.xml.builders; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.queryparser.xml.builders; import org.apache.lucene.search.LegacyNumericRangeQuery; import org.apache.lucene.search.Query; diff --git a/lucene/replicator/src/java/org/apache/lucene/replicator/IndexAndTaxonomyReplicationHandler.java b/lucene/replicator/src/java/org/apache/lucene/replicator/IndexAndTaxonomyReplicationHandler.java index a7868a91f60..ade091c4b4d 100644 --- a/lucene/replicator/src/java/org/apache/lucene/replicator/IndexAndTaxonomyReplicationHandler.java +++ b/lucene/replicator/src/java/org/apache/lucene/replicator/IndexAndTaxonomyReplicationHandler.java @@ -1,5 +1,3 @@ -package org.apache.lucene.replicator; - /* * 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.lucene.replicator; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.replicator; import java.io.IOException; import java.util.Collections; diff --git a/lucene/replicator/src/java/org/apache/lucene/replicator/IndexAndTaxonomyRevision.java b/lucene/replicator/src/java/org/apache/lucene/replicator/IndexAndTaxonomyRevision.java index dcecf9fd2ae..39df369017f 100644 --- a/lucene/replicator/src/java/org/apache/lucene/replicator/IndexAndTaxonomyRevision.java +++ b/lucene/replicator/src/java/org/apache/lucene/replicator/IndexAndTaxonomyRevision.java @@ -1,5 +1,3 @@ -package org.apache.lucene.replicator; - /* * 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.lucene.replicator; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.replicator; import java.io.IOException; import java.io.InputStream; diff --git a/lucene/replicator/src/java/org/apache/lucene/replicator/IndexInputInputStream.java b/lucene/replicator/src/java/org/apache/lucene/replicator/IndexInputInputStream.java index 32911948b67..6b6a8a99f22 100644 --- a/lucene/replicator/src/java/org/apache/lucene/replicator/IndexInputInputStream.java +++ b/lucene/replicator/src/java/org/apache/lucene/replicator/IndexInputInputStream.java @@ -1,5 +1,3 @@ -package org.apache.lucene.replicator; - /* * 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.lucene.replicator; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.replicator; import java.io.IOException; import java.io.InputStream; diff --git a/lucene/replicator/src/java/org/apache/lucene/replicator/IndexReplicationHandler.java b/lucene/replicator/src/java/org/apache/lucene/replicator/IndexReplicationHandler.java index e4fed8ccf98..8f801a33f88 100644 --- a/lucene/replicator/src/java/org/apache/lucene/replicator/IndexReplicationHandler.java +++ b/lucene/replicator/src/java/org/apache/lucene/replicator/IndexReplicationHandler.java @@ -1,5 +1,3 @@ -package org.apache.lucene.replicator; - /* * 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.lucene.replicator; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.replicator; import java.io.IOException; import java.util.Collections; diff --git a/lucene/replicator/src/java/org/apache/lucene/replicator/IndexRevision.java b/lucene/replicator/src/java/org/apache/lucene/replicator/IndexRevision.java index c43d331cb79..14f9b5db469 100644 --- a/lucene/replicator/src/java/org/apache/lucene/replicator/IndexRevision.java +++ b/lucene/replicator/src/java/org/apache/lucene/replicator/IndexRevision.java @@ -1,5 +1,3 @@ -package org.apache.lucene.replicator; - /* * 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.lucene.replicator; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.replicator; import java.io.IOException; import java.io.InputStream; diff --git a/lucene/replicator/src/java/org/apache/lucene/replicator/LocalReplicator.java b/lucene/replicator/src/java/org/apache/lucene/replicator/LocalReplicator.java index 632fd165ddf..bab5083a8f4 100644 --- a/lucene/replicator/src/java/org/apache/lucene/replicator/LocalReplicator.java +++ b/lucene/replicator/src/java/org/apache/lucene/replicator/LocalReplicator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.replicator; - /* * 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.lucene.replicator; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.replicator; import java.io.IOException; import java.io.InputStream; diff --git a/lucene/replicator/src/java/org/apache/lucene/replicator/PerSessionDirectoryFactory.java b/lucene/replicator/src/java/org/apache/lucene/replicator/PerSessionDirectoryFactory.java index 794ab041625..2cdc1ea3286 100644 --- a/lucene/replicator/src/java/org/apache/lucene/replicator/PerSessionDirectoryFactory.java +++ b/lucene/replicator/src/java/org/apache/lucene/replicator/PerSessionDirectoryFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.replicator; - /* * 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.lucene.replicator; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.replicator; import java.io.IOException; import java.nio.file.Files; diff --git a/lucene/replicator/src/java/org/apache/lucene/replicator/ReplicationClient.java b/lucene/replicator/src/java/org/apache/lucene/replicator/ReplicationClient.java index b7478535c6a..02fb657fefc 100644 --- a/lucene/replicator/src/java/org/apache/lucene/replicator/ReplicationClient.java +++ b/lucene/replicator/src/java/org/apache/lucene/replicator/ReplicationClient.java @@ -1,5 +1,3 @@ -package org.apache.lucene.replicator; - /* * 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.lucene.replicator; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.replicator; import java.io.Closeable; import java.io.IOException; diff --git a/lucene/replicator/src/java/org/apache/lucene/replicator/Replicator.java b/lucene/replicator/src/java/org/apache/lucene/replicator/Replicator.java index 3e4d4e5f42a..971776db333 100644 --- a/lucene/replicator/src/java/org/apache/lucene/replicator/Replicator.java +++ b/lucene/replicator/src/java/org/apache/lucene/replicator/Replicator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.replicator; - /* * 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.lucene.replicator; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.replicator; import java.io.Closeable; import java.io.IOException; diff --git a/lucene/replicator/src/java/org/apache/lucene/replicator/Revision.java b/lucene/replicator/src/java/org/apache/lucene/replicator/Revision.java index 9df22fbe91c..93fccd96bff 100644 --- a/lucene/replicator/src/java/org/apache/lucene/replicator/Revision.java +++ b/lucene/replicator/src/java/org/apache/lucene/replicator/Revision.java @@ -1,5 +1,3 @@ -package org.apache.lucene.replicator; - /* * 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.lucene.replicator; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.replicator; import java.io.IOException; import java.io.InputStream; diff --git a/lucene/replicator/src/java/org/apache/lucene/replicator/RevisionFile.java b/lucene/replicator/src/java/org/apache/lucene/replicator/RevisionFile.java index 3fc8cffcb73..7d3d4b7660c 100644 --- a/lucene/replicator/src/java/org/apache/lucene/replicator/RevisionFile.java +++ b/lucene/replicator/src/java/org/apache/lucene/replicator/RevisionFile.java @@ -1,5 +1,3 @@ -package org.apache.lucene.replicator; - /* * 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.lucene.replicator; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.replicator; /** * Describes a file in a {@link Revision}. A file has a source, which allows a diff --git a/lucene/replicator/src/java/org/apache/lucene/replicator/SessionExpiredException.java b/lucene/replicator/src/java/org/apache/lucene/replicator/SessionExpiredException.java index 4b697c3c3ce..d7e2441da85 100644 --- a/lucene/replicator/src/java/org/apache/lucene/replicator/SessionExpiredException.java +++ b/lucene/replicator/src/java/org/apache/lucene/replicator/SessionExpiredException.java @@ -1,5 +1,3 @@ -package org.apache.lucene.replicator; - /* * 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.lucene.replicator; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.replicator; import java.io.IOException; diff --git a/lucene/replicator/src/java/org/apache/lucene/replicator/SessionToken.java b/lucene/replicator/src/java/org/apache/lucene/replicator/SessionToken.java index 955736e937e..28ab311e62a 100644 --- a/lucene/replicator/src/java/org/apache/lucene/replicator/SessionToken.java +++ b/lucene/replicator/src/java/org/apache/lucene/replicator/SessionToken.java @@ -1,5 +1,3 @@ -package org.apache.lucene.replicator; - /* * 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.lucene.replicator; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.replicator; import java.io.DataInput; import java.io.DataOutput; diff --git a/lucene/replicator/src/java/org/apache/lucene/replicator/http/HttpClientBase.java b/lucene/replicator/src/java/org/apache/lucene/replicator/http/HttpClientBase.java index bf4c00f0836..920f1de18aa 100644 --- a/lucene/replicator/src/java/org/apache/lucene/replicator/http/HttpClientBase.java +++ b/lucene/replicator/src/java/org/apache/lucene/replicator/http/HttpClientBase.java @@ -1,5 +1,3 @@ -package org.apache.lucene.replicator.http; - /* * 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.lucene.replicator.http; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.replicator.http; import java.io.Closeable; import java.io.IOException; diff --git a/lucene/replicator/src/java/org/apache/lucene/replicator/http/HttpReplicator.java b/lucene/replicator/src/java/org/apache/lucene/replicator/http/HttpReplicator.java index 337cd37cee2..95323a1f3e9 100644 --- a/lucene/replicator/src/java/org/apache/lucene/replicator/http/HttpReplicator.java +++ b/lucene/replicator/src/java/org/apache/lucene/replicator/http/HttpReplicator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.replicator.http; - /* * 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.lucene.replicator.http; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.replicator.http; import java.io.DataInputStream; import java.io.IOException; diff --git a/lucene/replicator/src/java/org/apache/lucene/replicator/http/ReplicationService.java b/lucene/replicator/src/java/org/apache/lucene/replicator/http/ReplicationService.java index 3815f8d218e..4cb4368b8b4 100644 --- a/lucene/replicator/src/java/org/apache/lucene/replicator/http/ReplicationService.java +++ b/lucene/replicator/src/java/org/apache/lucene/replicator/http/ReplicationService.java @@ -1,5 +1,3 @@ -package org.apache.lucene.replicator.http; - /* * 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.lucene.replicator.http; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.replicator.http; import java.io.DataOutputStream; import java.io.IOException; diff --git a/lucene/replicator/src/java/org/apache/lucene/replicator/http/package-info.java b/lucene/replicator/src/java/org/apache/lucene/replicator/http/package-info.java index b4769c2d8cb..acad49b1781 100644 --- a/lucene/replicator/src/java/org/apache/lucene/replicator/http/package-info.java +++ b/lucene/replicator/src/java/org/apache/lucene/replicator/http/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * HTTP replication implementation */ diff --git a/lucene/replicator/src/java/org/apache/lucene/replicator/package-info.java b/lucene/replicator/src/java/org/apache/lucene/replicator/package-info.java index 869447ff565..4ecc3e7c836 100644 --- a/lucene/replicator/src/java/org/apache/lucene/replicator/package-info.java +++ b/lucene/replicator/src/java/org/apache/lucene/replicator/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** *

Files replication framework

* diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/IndexAndTaxonomyReplicationClientTest.java b/lucene/replicator/src/test/org/apache/lucene/replicator/IndexAndTaxonomyReplicationClientTest.java index 310399f2829..b62747f92de 100644 --- a/lucene/replicator/src/test/org/apache/lucene/replicator/IndexAndTaxonomyReplicationClientTest.java +++ b/lucene/replicator/src/test/org/apache/lucene/replicator/IndexAndTaxonomyReplicationClientTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.replicator; - /* * 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.lucene.replicator; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.replicator; import java.io.ByteArrayOutputStream; import java.io.Closeable; diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/IndexAndTaxonomyRevisionTest.java b/lucene/replicator/src/test/org/apache/lucene/replicator/IndexAndTaxonomyRevisionTest.java index 2c832daef11..833088b4ab7 100644 --- a/lucene/replicator/src/test/org/apache/lucene/replicator/IndexAndTaxonomyRevisionTest.java +++ b/lucene/replicator/src/test/org/apache/lucene/replicator/IndexAndTaxonomyRevisionTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.replicator; - /* * 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.lucene.replicator; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.replicator; import java.io.IOException; import java.io.InputStream; diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/IndexReplicationClientTest.java b/lucene/replicator/src/test/org/apache/lucene/replicator/IndexReplicationClientTest.java index 3f910133ce0..3059e0dce96 100644 --- a/lucene/replicator/src/test/org/apache/lucene/replicator/IndexReplicationClientTest.java +++ b/lucene/replicator/src/test/org/apache/lucene/replicator/IndexReplicationClientTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.replicator; - /* * 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.lucene.replicator; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.replicator; import java.io.Closeable; import java.io.IOException; diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/IndexRevisionTest.java b/lucene/replicator/src/test/org/apache/lucene/replicator/IndexRevisionTest.java index 6ebdd15ab45..ff50abc3897 100644 --- a/lucene/replicator/src/test/org/apache/lucene/replicator/IndexRevisionTest.java +++ b/lucene/replicator/src/test/org/apache/lucene/replicator/IndexRevisionTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.replicator; - /* * 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.lucene.replicator; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.replicator; import java.io.InputStream; import java.util.List; diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/LocalReplicatorTest.java b/lucene/replicator/src/test/org/apache/lucene/replicator/LocalReplicatorTest.java index 3c9a8d1dc06..da60377fa1a 100644 --- a/lucene/replicator/src/test/org/apache/lucene/replicator/LocalReplicatorTest.java +++ b/lucene/replicator/src/test/org/apache/lucene/replicator/LocalReplicatorTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.replicator; - /* * 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.lucene.replicator; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.replicator; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/ReplicatorTestCase.java b/lucene/replicator/src/test/org/apache/lucene/replicator/ReplicatorTestCase.java index 410d551da44..a6045b5381b 100644 --- a/lucene/replicator/src/test/org/apache/lucene/replicator/ReplicatorTestCase.java +++ b/lucene/replicator/src/test/org/apache/lucene/replicator/ReplicatorTestCase.java @@ -1,5 +1,3 @@ -package org.apache.lucene.replicator; - /* * 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.lucene.replicator; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.replicator; import java.util.Random; import java.util.concurrent.TimeUnit; diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/SessionTokenTest.java b/lucene/replicator/src/test/org/apache/lucene/replicator/SessionTokenTest.java index 7416f1c03ca..d595a7d21e4 100644 --- a/lucene/replicator/src/test/org/apache/lucene/replicator/SessionTokenTest.java +++ b/lucene/replicator/src/test/org/apache/lucene/replicator/SessionTokenTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.replicator; - /* * 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.lucene.replicator; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.replicator; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/http/HttpReplicatorTest.java b/lucene/replicator/src/test/org/apache/lucene/replicator/http/HttpReplicatorTest.java index ecbe3b6b0d2..1143d9aa313 100644 --- a/lucene/replicator/src/test/org/apache/lucene/replicator/http/HttpReplicatorTest.java +++ b/lucene/replicator/src/test/org/apache/lucene/replicator/http/HttpReplicatorTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.replicator.http; - /* * 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.lucene.replicator.http; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.replicator.http; import java.io.IOException; import java.nio.file.Path; diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/http/ReplicationServlet.java b/lucene/replicator/src/test/org/apache/lucene/replicator/http/ReplicationServlet.java index 11b34a71286..ccafc2a5268 100644 --- a/lucene/replicator/src/test/org/apache/lucene/replicator/http/ReplicationServlet.java +++ b/lucene/replicator/src/test/org/apache/lucene/replicator/http/ReplicationServlet.java @@ -1,5 +1,3 @@ -package org.apache.lucene.replicator.http; - /* * 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.lucene.replicator.http; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.replicator.http; import java.io.IOException; diff --git a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionPostingsFormat.java b/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionPostingsFormat.java index 042e361f16a..53b64dc0be3 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionPostingsFormat.java +++ b/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionPostingsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.idversion; - /* * 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.lucene.codecs.idversion; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.idversion; import java.io.IOException; diff --git a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionPostingsReader.java b/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionPostingsReader.java index d6a6a619a9c..ce73e40b676 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionPostingsReader.java +++ b/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionPostingsReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.idversion; - /* * 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.lucene.codecs.idversion; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.idversion; import java.io.IOException; diff --git a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionPostingsWriter.java b/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionPostingsWriter.java index 9d25fd3cc3a..334f784c405 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionPostingsWriter.java +++ b/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionPostingsWriter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.idversion; - /* * 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.lucene.codecs.idversion; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.idversion; import java.io.IOException; diff --git a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionSegmentTermsEnum.java b/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionSegmentTermsEnum.java index 138bb597762..dbb29811ade 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionSegmentTermsEnum.java +++ b/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionSegmentTermsEnum.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.idversion; - /* * 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.lucene.codecs.idversion; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.idversion; import java.io.IOException; import java.io.PrintStream; diff --git a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionSegmentTermsEnumFrame.java b/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionSegmentTermsEnumFrame.java index f789d76626e..6d260773353 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionSegmentTermsEnumFrame.java +++ b/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionSegmentTermsEnumFrame.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.idversion; - /* * 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.lucene.codecs.idversion; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.idversion; import java.io.IOException; diff --git a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionTermState.java b/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionTermState.java index 227f3f863c7..27f766dff4d 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionTermState.java +++ b/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionTermState.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.idversion; - /* * 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.lucene.codecs.idversion; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.idversion; import org.apache.lucene.codecs.BlockTermState; import org.apache.lucene.index.TermState; diff --git a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/SingleDocsEnum.java b/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/SingleDocsEnum.java index 5bba79c949d..87886d356d4 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/SingleDocsEnum.java +++ b/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/SingleDocsEnum.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.idversion; - /* * 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.lucene.codecs.idversion; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.idversion; import java.io.IOException; diff --git a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/SinglePostingsEnum.java b/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/SinglePostingsEnum.java index 04b94808ee4..d65423a0fc7 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/SinglePostingsEnum.java +++ b/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/SinglePostingsEnum.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.idversion; - /* * 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.lucene.codecs.idversion; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.idversion; import org.apache.lucene.index.PostingsEnum; import org.apache.lucene.util.BytesRef; diff --git a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionBlockTreeTermsReader.java b/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionBlockTreeTermsReader.java index 1f892faafbe..167bb4808e4 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionBlockTreeTermsReader.java +++ b/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionBlockTreeTermsReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.idversion; - /* * 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.lucene.codecs.idversion; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.idversion; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionBlockTreeTermsWriter.java b/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionBlockTreeTermsWriter.java index 8866dee9bae..b49ea794476 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionBlockTreeTermsWriter.java +++ b/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionBlockTreeTermsWriter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.idversion; - /* * 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.lucene.codecs.idversion; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.idversion; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionFieldReader.java b/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionFieldReader.java index 05ab818bf28..581201f9ea4 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionFieldReader.java +++ b/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/VersionFieldReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.idversion; - /* * 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.lucene.codecs.idversion; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.idversion; import java.io.IOException; import java.util.Collection; diff --git a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/package-info.java b/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/package-info.java index 43c3ec2cec0..cccb9a6f642 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/package-info.java +++ b/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * A primary-key postings format that associates a version (long) with each term and * can provide fail-fast lookups by ID and version. diff --git a/lucene/sandbox/src/java/org/apache/lucene/document/GeoPointField.java b/lucene/sandbox/src/java/org/apache/lucene/document/GeoPointField.java index be70db557cf..ad1483db212 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/document/GeoPointField.java +++ b/lucene/sandbox/src/java/org/apache/lucene/document/GeoPointField.java @@ -1,5 +1,3 @@ -package org.apache.lucene.document; - /* * 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.lucene.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.document; import org.apache.lucene.index.DocValuesType; import org.apache.lucene.index.IndexOptions; diff --git a/lucene/sandbox/src/java/org/apache/lucene/document/LatLonPoint.java b/lucene/sandbox/src/java/org/apache/lucene/document/LatLonPoint.java index ac52b002734..71d95272385 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/document/LatLonPoint.java +++ b/lucene/sandbox/src/java/org/apache/lucene/document/LatLonPoint.java @@ -1,5 +1,3 @@ -package org.apache.lucene.document; - /* * 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.lucene.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.document; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.GeoUtils; diff --git a/lucene/sandbox/src/java/org/apache/lucene/payloads/PayloadSpanCollector.java b/lucene/sandbox/src/java/org/apache/lucene/payloads/PayloadSpanCollector.java index 690bbcc4374..cbade087bd2 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/payloads/PayloadSpanCollector.java +++ b/lucene/sandbox/src/java/org/apache/lucene/payloads/PayloadSpanCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.payloads; - /* * 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.lucene.payloads; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.payloads; import org.apache.lucene.index.PostingsEnum; import org.apache.lucene.index.Term; diff --git a/lucene/sandbox/src/java/org/apache/lucene/payloads/PayloadSpanUtil.java b/lucene/sandbox/src/java/org/apache/lucene/payloads/PayloadSpanUtil.java index 6c9ced2eddf..400e42cf1f9 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/payloads/PayloadSpanUtil.java +++ b/lucene/sandbox/src/java/org/apache/lucene/payloads/PayloadSpanUtil.java @@ -1,5 +1,3 @@ -package org.apache.lucene.payloads; - /* * 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.lucene.payloads; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.payloads; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/sandbox/src/java/org/apache/lucene/payloads/package-info.java b/lucene/sandbox/src/java/org/apache/lucene/payloads/package-info.java index b2a6bb3ad32..a42da0cd289 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/payloads/package-info.java +++ b/lucene/sandbox/src/java/org/apache/lucene/payloads/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Experimental classes for interacting with payloads */ diff --git a/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java index a920537ab09..adfa9d3131b 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java +++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.sandbox.queries; - /* * 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.lucene.sandbox.queries; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.sandbox.queries; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowFuzzyQuery.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowFuzzyQuery.java index 42098c1887a..fb4c202103e 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowFuzzyQuery.java +++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowFuzzyQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.sandbox.queries; - /* * 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.lucene.sandbox.queries; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.sandbox.queries; import java.io.IOException; diff --git a/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowFuzzyTermsEnum.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowFuzzyTermsEnum.java index 5f4dfcf93d0..21724bdc229 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowFuzzyTermsEnum.java +++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowFuzzyTermsEnum.java @@ -1,5 +1,3 @@ -package org.apache.lucene.sandbox.queries; - /* * 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.lucene.sandbox.queries; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.sandbox.queries; import java.io.IOException; diff --git a/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/package-info.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/package-info.java index 499403fad8c..7766b8a2498 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/package-info.java +++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Additional queries (some may have caveats or limitations) */ diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/DocValuesNumbersQuery.java b/lucene/sandbox/src/java/org/apache/lucene/search/DocValuesNumbersQuery.java index f48b96ca38e..d9ad4bee6a3 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/DocValuesNumbersQuery.java +++ b/lucene/sandbox/src/java/org/apache/lucene/search/DocValuesNumbersQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import org.apache.lucene.document.NumericDocValuesField; import org.apache.lucene.document.SortedNumericDocValuesField; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/DocValuesRangeQuery.java b/lucene/sandbox/src/java/org/apache/lucene/search/DocValuesRangeQuery.java index a45e4b0a4fe..8105968093a 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/DocValuesRangeQuery.java +++ b/lucene/sandbox/src/java/org/apache/lucene/search/DocValuesRangeQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import java.io.IOException; import java.util.Objects; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/DocValuesTermsQuery.java b/lucene/sandbox/src/java/org/apache/lucene/search/DocValuesTermsQuery.java index 7a0ea8eb6da..5faddc1339e 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/DocValuesTermsQuery.java +++ b/lucene/sandbox/src/java/org/apache/lucene/search/DocValuesTermsQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import java.io.IOException; import java.util.AbstractList; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/GeoBoundingBox.java b/lucene/sandbox/src/java/org/apache/lucene/search/GeoBoundingBox.java index 3e3650d1cc0..c2c92eaed5b 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/GeoBoundingBox.java +++ b/lucene/sandbox/src/java/org/apache/lucene/search/GeoBoundingBox.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import org.apache.lucene.util.GeoUtils; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointDistanceQuery.java b/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointDistanceQuery.java index 21f276859b2..a77798b9a84 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointDistanceQuery.java +++ b/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointDistanceQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import org.apache.lucene.index.IndexReader; import org.apache.lucene.util.GeoDistanceUtils; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointDistanceQueryImpl.java b/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointDistanceQueryImpl.java index 8de7f9f6f32..ef2155b4daa 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointDistanceQueryImpl.java +++ b/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointDistanceQueryImpl.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import java.io.IOException; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointDistanceRangeQuery.java b/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointDistanceRangeQuery.java index 7ebaf99cce6..5324a6d53a8 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointDistanceRangeQuery.java +++ b/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointDistanceRangeQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import org.apache.lucene.index.IndexReader; import org.apache.lucene.util.GeoProjectionUtils; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointInBBoxQuery.java b/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointInBBoxQuery.java index bdd6c9f4fe4..0926a4f94ea 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointInBBoxQuery.java +++ b/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointInBBoxQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import org.apache.lucene.index.IndexReader; import org.apache.lucene.util.GeoUtils; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointInBBoxQueryImpl.java b/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointInBBoxQueryImpl.java index f192c736210..b385a542ff5 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointInBBoxQueryImpl.java +++ b/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointInBBoxQueryImpl.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import java.io.IOException; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointInPolygonQuery.java b/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointInPolygonQuery.java index 950beaeff1d..abdcf95baea 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointInPolygonQuery.java +++ b/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointInPolygonQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import java.io.IOException; import java.util.Arrays; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointTermQuery.java b/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointTermQuery.java index 48de1ccb2c5..5ec0774dd3d 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointTermQuery.java +++ b/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointTermQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import org.apache.lucene.index.IndexReader; import org.apache.lucene.util.GeoUtils; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointTermQueryConstantScoreWrapper.java b/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointTermQueryConstantScoreWrapper.java index e9099aceec3..e00bb720967 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointTermQueryConstantScoreWrapper.java +++ b/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointTermQueryConstantScoreWrapper.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import java.io.IOException; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointTermsEnum.java b/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointTermsEnum.java index 38f4d220a8f..e2f96d4cb6d 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointTermsEnum.java +++ b/lucene/sandbox/src/java/org/apache/lucene/search/GeoPointTermsEnum.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import java.util.Collections; import java.util.LinkedList; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/PointInPolygonQuery.java b/lucene/sandbox/src/java/org/apache/lucene/search/PointInPolygonQuery.java index 81e49e77cd1..861a1099e80 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/PointInPolygonQuery.java +++ b/lucene/sandbox/src/java/org/apache/lucene/search/PointInPolygonQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import java.io.IOException; import java.util.Arrays; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/PointInRectQuery.java b/lucene/sandbox/src/java/org/apache/lucene/search/PointInRectQuery.java index 9af6097609a..6ef1703397d 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/PointInRectQuery.java +++ b/lucene/sandbox/src/java/org/apache/lucene/search/PointInRectQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import java.io.IOException; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/TermAutomatonQuery.java b/lucene/sandbox/src/java/org/apache/lucene/search/TermAutomatonQuery.java index 60b1e682b1c..e9321df68f3 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/TermAutomatonQuery.java +++ b/lucene/sandbox/src/java/org/apache/lucene/search/TermAutomatonQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/TermAutomatonScorer.java b/lucene/sandbox/src/java/org/apache/lucene/search/TermAutomatonScorer.java index 31d55fc2548..9c5cf7f25a7 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/TermAutomatonScorer.java +++ b/lucene/sandbox/src/java/org/apache/lucene/search/TermAutomatonScorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import java.io.IOException; import java.util.Map; diff --git a/lucene/sandbox/src/java/org/apache/lucene/search/TokenStreamToTermAutomatonQuery.java b/lucene/sandbox/src/java/org/apache/lucene/search/TokenStreamToTermAutomatonQuery.java index e8f838ba901..cac0783e79d 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/search/TokenStreamToTermAutomatonQuery.java +++ b/lucene/sandbox/src/java/org/apache/lucene/search/TokenStreamToTermAutomatonQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import java.io.IOException; diff --git a/lucene/sandbox/src/java/org/apache/lucene/util/GeoDistanceUtils.java b/lucene/sandbox/src/java/org/apache/lucene/util/GeoDistanceUtils.java index 8ad09b9fbce..91347094dc5 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/util/GeoDistanceUtils.java +++ b/lucene/sandbox/src/java/org/apache/lucene/util/GeoDistanceUtils.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * 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.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; import static org.apache.lucene.util.SloppyMath.TO_RADIANS; diff --git a/lucene/sandbox/src/java/org/apache/lucene/util/GeoHashUtils.java b/lucene/sandbox/src/java/org/apache/lucene/util/GeoHashUtils.java index e5a6e46e3ff..d421cc9f5b2 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/util/GeoHashUtils.java +++ b/lucene/sandbox/src/java/org/apache/lucene/util/GeoHashUtils.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * 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.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; import java.util.ArrayList; import java.util.Collection; diff --git a/lucene/sandbox/src/java/org/apache/lucene/util/GeoProjectionUtils.java b/lucene/sandbox/src/java/org/apache/lucene/util/GeoProjectionUtils.java index 4ff80f2e123..7e285dafed1 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/util/GeoProjectionUtils.java +++ b/lucene/sandbox/src/java/org/apache/lucene/util/GeoProjectionUtils.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * 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.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; import static org.apache.lucene.util.SloppyMath.PIO2; import static org.apache.lucene.util.SloppyMath.TO_DEGREES; diff --git a/lucene/sandbox/src/java/org/apache/lucene/util/GeoRect.java b/lucene/sandbox/src/java/org/apache/lucene/util/GeoRect.java index 1e9317c9238..f8cf1da8a26 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/util/GeoRect.java +++ b/lucene/sandbox/src/java/org/apache/lucene/util/GeoRect.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * 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.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; /** Represents a lat/lon rectangle. */ public class GeoRect { diff --git a/lucene/sandbox/src/java/org/apache/lucene/util/GeoRelationUtils.java b/lucene/sandbox/src/java/org/apache/lucene/util/GeoRelationUtils.java index 9d42ba18f06..092b9498134 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/util/GeoRelationUtils.java +++ b/lucene/sandbox/src/java/org/apache/lucene/util/GeoRelationUtils.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * 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.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; /** * Reusable geo-relation utility methods diff --git a/lucene/sandbox/src/java/org/apache/lucene/util/GeoUtils.java b/lucene/sandbox/src/java/org/apache/lucene/util/GeoUtils.java index 5239e5adaab..a2d0fd14f56 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/util/GeoUtils.java +++ b/lucene/sandbox/src/java/org/apache/lucene/util/GeoUtils.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * 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.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; import java.util.ArrayList; diff --git a/lucene/sandbox/src/test/org/apache/lucene/codecs/idversion/StringAndPayloadField.java b/lucene/sandbox/src/test/org/apache/lucene/codecs/idversion/StringAndPayloadField.java index 41624f3fef8..ddfce177659 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/codecs/idversion/StringAndPayloadField.java +++ b/lucene/sandbox/src/test/org/apache/lucene/codecs/idversion/StringAndPayloadField.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.idversion; - /* * 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.lucene.codecs.idversion; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.idversion; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.TokenStream; diff --git a/lucene/sandbox/src/test/org/apache/lucene/codecs/idversion/TestIDVersionPostingsFormat.java b/lucene/sandbox/src/test/org/apache/lucene/codecs/idversion/TestIDVersionPostingsFormat.java index 5a7a3d617f6..efbd6ad4259 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/codecs/idversion/TestIDVersionPostingsFormat.java +++ b/lucene/sandbox/src/test/org/apache/lucene/codecs/idversion/TestIDVersionPostingsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.idversion; - /* * 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.lucene.codecs.idversion; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.idversion; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/sandbox/src/test/org/apache/lucene/payloads/TestPayloadSpanUtil.java b/lucene/sandbox/src/test/org/apache/lucene/payloads/TestPayloadSpanUtil.java index b08164475a4..ecf2ff63617 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/payloads/TestPayloadSpanUtil.java +++ b/lucene/sandbox/src/test/org/apache/lucene/payloads/TestPayloadSpanUtil.java @@ -1,5 +1,3 @@ -package org.apache.lucene.payloads; - /* * 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.lucene.payloads; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.payloads; import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/FuzzyLikeThisQueryTest.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/FuzzyLikeThisQueryTest.java index 64cc5f210f2..b321494ad49 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/FuzzyLikeThisQueryTest.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/FuzzyLikeThisQueryTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.sandbox.queries; - /* * 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.lucene.sandbox.queries; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.sandbox.queries; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.MockAnalyzer; diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery.java index 731d06099e2..4b4aa38c2fe 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.sandbox.queries; - /* * 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.lucene.sandbox.queries; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.sandbox.queries; import java.util.List; import java.util.Arrays; diff --git a/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery2.java b/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery2.java index 637b8ae602e..84145a1f824 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery2.java +++ b/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery2.java @@ -1,5 +1,3 @@ -package org.apache.lucene.sandbox.queries; - /* * 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.lucene.sandbox.queries; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.sandbox.queries; import java.io.BufferedReader; import java.io.InputStream; diff --git a/lucene/sandbox/src/test/org/apache/lucene/search/TestDocValuesNumbersQuery.java b/lucene/sandbox/src/test/org/apache/lucene/search/TestDocValuesNumbersQuery.java index 65ae541de5f..06c2d236e68 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/search/TestDocValuesNumbersQuery.java +++ b/lucene/sandbox/src/test/org/apache/lucene/search/TestDocValuesNumbersQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field.Store; diff --git a/lucene/sandbox/src/test/org/apache/lucene/search/TestDocValuesRangeQuery.java b/lucene/sandbox/src/test/org/apache/lucene/search/TestDocValuesRangeQuery.java index 694fcdabf36..7960ce017ce 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/search/TestDocValuesRangeQuery.java +++ b/lucene/sandbox/src/test/org/apache/lucene/search/TestDocValuesRangeQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import java.io.IOException; diff --git a/lucene/sandbox/src/test/org/apache/lucene/search/TestDocValuesTermsQuery.java b/lucene/sandbox/src/test/org/apache/lucene/search/TestDocValuesTermsQuery.java index 5f4c63c5987..6e994927947 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/search/TestDocValuesTermsQuery.java +++ b/lucene/sandbox/src/test/org/apache/lucene/search/TestDocValuesTermsQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/sandbox/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java b/lucene/sandbox/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java index 796336c265b..96b5713d246 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java +++ b/lucene/sandbox/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import org.apache.lucene.document.Field; import org.apache.lucene.document.SortedDocValuesField; diff --git a/lucene/sandbox/src/test/org/apache/lucene/search/TestGeoPointQuery.java b/lucene/sandbox/src/test/org/apache/lucene/search/TestGeoPointQuery.java index 9763d6e0cd5..a91cbd68a9b 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/search/TestGeoPointQuery.java +++ b/lucene/sandbox/src/test/org/apache/lucene/search/TestGeoPointQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; diff --git a/lucene/sandbox/src/test/org/apache/lucene/search/TestLatLonPointQueries.java b/lucene/sandbox/src/test/org/apache/lucene/search/TestLatLonPointQueries.java index 1a9e2c7ae89..e898f1cfd48 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/search/TestLatLonPointQueries.java +++ b/lucene/sandbox/src/test/org/apache/lucene/search/TestLatLonPointQueries.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import org.apache.lucene.document.LatLonPoint; import org.apache.lucene.document.Document; diff --git a/lucene/sandbox/src/test/org/apache/lucene/search/TestTermAutomatonQuery.java b/lucene/sandbox/src/test/org/apache/lucene/search/TestTermAutomatonQuery.java index 6b1538c95d9..b5e784e5248 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/search/TestTermAutomatonQuery.java +++ b/lucene/sandbox/src/test/org/apache/lucene/search/TestTermAutomatonQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/sandbox/src/test/org/apache/lucene/util/BaseGeoPointTestCase.java b/lucene/sandbox/src/test/org/apache/lucene/util/BaseGeoPointTestCase.java index 42adeabb1dd..5a469db5ce2 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/util/BaseGeoPointTestCase.java +++ b/lucene/sandbox/src/test/org/apache/lucene/util/BaseGeoPointTestCase.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * 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.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; import java.io.IOException; import java.text.DecimalFormat; diff --git a/lucene/sandbox/src/test/org/apache/lucene/util/TestGeoUtils.java b/lucene/sandbox/src/test/org/apache/lucene/util/TestGeoUtils.java index cf0576d7f33..56506148f9d 100644 --- a/lucene/sandbox/src/test/org/apache/lucene/util/TestGeoUtils.java +++ b/lucene/sandbox/src/test/org/apache/lucene/util/TestGeoUtils.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * 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.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/SpatialStrategy.java b/lucene/spatial/src/java/org/apache/lucene/spatial/SpatialStrategy.java index c56da5845f5..f433c111e0c 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/SpatialStrategy.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/SpatialStrategy.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial; - /* * 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.lucene.spatial; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial; import com.spatial4j.core.context.SpatialContext; import com.spatial4j.core.shape.Point; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxSimilarityValueSource.java b/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxSimilarityValueSource.java index 4752052bb76..15cd646173d 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxSimilarityValueSource.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxSimilarityValueSource.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.bbox; - /* * 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.lucene.spatial.bbox; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.bbox; import java.io.IOException; import java.util.Map; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxStrategy.java b/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxStrategy.java index 934b3b91ee5..9bae0dcf321 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxStrategy.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxStrategy.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.bbox; - /* * 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.lucene.spatial.bbox; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.bbox; import com.spatial4j.core.context.SpatialContext; import com.spatial4j.core.shape.Point; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxValueSource.java b/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxValueSource.java index 10fa7b93336..5d954074d32 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxValueSource.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/BBoxValueSource.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.bbox; - /* * 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.lucene.spatial.bbox; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.bbox; import com.spatial4j.core.shape.Rectangle; import org.apache.lucene.index.LeafReader; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/package-info.java b/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/package-info.java index c19529f2f11..19e9fd3cd57 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/package-info.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Bounding Box Spatial Strategy *

diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/composite/CompositeSpatialStrategy.java b/lucene/spatial/src/java/org/apache/lucene/spatial/composite/CompositeSpatialStrategy.java index 6522862d75d..7dc2dfaa05a 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/composite/CompositeSpatialStrategy.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/composite/CompositeSpatialStrategy.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.composite; - /* * 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.lucene.spatial.composite; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.composite; import java.util.ArrayList; import java.util.Collections; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/composite/CompositeVerifyQuery.java b/lucene/spatial/src/java/org/apache/lucene/spatial/composite/CompositeVerifyQuery.java index 1ae13268986..e03d95958ef 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/composite/CompositeVerifyQuery.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/composite/CompositeVerifyQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.composite; - /* * 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.lucene.spatial.composite; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.composite; import java.io.IOException; import java.util.Map; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/composite/IntersectsRPTVerifyQuery.java b/lucene/spatial/src/java/org/apache/lucene/spatial/composite/IntersectsRPTVerifyQuery.java index 7810c21c8c6..a963b6eac6b 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/composite/IntersectsRPTVerifyQuery.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/composite/IntersectsRPTVerifyQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.composite; - /* * 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.lucene.spatial.composite; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.composite; import java.io.IOException; import java.util.Map; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/composite/package-info.java b/lucene/spatial/src/java/org/apache/lucene/spatial/composite/package-info.java index c207ea6b293..04cb9fc8b22 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/composite/package-info.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/composite/package-info.java @@ -14,6 +14,5 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** Composite strategies. */ package org.apache.lucene.spatial.composite; \ No newline at end of file diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/package-info.java b/lucene/spatial/src/java/org/apache/lucene/spatial/package-info.java index 9e768b6efe8..8a4b1d1da6e 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/package-info.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Lucene spatial search */ diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/AbstractPrefixTreeQuery.java b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/AbstractPrefixTreeQuery.java index b0def9bbdae..127e6891588 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/AbstractPrefixTreeQuery.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/AbstractPrefixTreeQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.prefix; - /* * 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.lucene.spatial.prefix; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.prefix; import java.io.IOException; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/AbstractVisitingPrefixTreeQuery.java b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/AbstractVisitingPrefixTreeQuery.java index c70cedbde6f..2237ca9dbf0 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/AbstractVisitingPrefixTreeQuery.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/AbstractVisitingPrefixTreeQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.prefix; - /* * 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.lucene.spatial.prefix; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.prefix; import java.io.IOException; import java.util.Iterator; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/BytesRefIteratorTokenStream.java b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/BytesRefIteratorTokenStream.java index 071edf4a384..e724ab05fe6 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/BytesRefIteratorTokenStream.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/BytesRefIteratorTokenStream.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.prefix; - /* * 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.lucene.spatial.prefix; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.prefix; import java.io.IOException; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/CellToBytesRefIterator.java b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/CellToBytesRefIterator.java index ac7e54aea1b..0b81b262ddf 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/CellToBytesRefIterator.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/CellToBytesRefIterator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.prefix; - /* * 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.lucene.spatial.prefix; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.prefix; import java.util.Iterator; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/ContainsPrefixTreeQuery.java b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/ContainsPrefixTreeQuery.java index 3e86948c4c6..7eadb646691 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/ContainsPrefixTreeQuery.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/ContainsPrefixTreeQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.prefix; - /* * 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.lucene.spatial.prefix; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.prefix; import java.io.IOException; import java.util.Arrays; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/HeatmapFacetCounter.java b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/HeatmapFacetCounter.java index d6d98f28d9d..c6700cdef59 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/HeatmapFacetCounter.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/HeatmapFacetCounter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.prefix; - /* * 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.lucene.spatial.prefix; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.prefix; import java.io.IOException; import java.util.HashMap; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/IntersectsPrefixTreeQuery.java b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/IntersectsPrefixTreeQuery.java index d0e4927fdce..ccb0f89ba17 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/IntersectsPrefixTreeQuery.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/IntersectsPrefixTreeQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.prefix; - /* * 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.lucene.spatial.prefix; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.prefix; import java.io.IOException; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/NumberRangePrefixTreeStrategy.java b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/NumberRangePrefixTreeStrategy.java index d4de0d8318a..8001c82afc2 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/NumberRangePrefixTreeStrategy.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/NumberRangePrefixTreeStrategy.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.prefix; - /* * 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.lucene.spatial.prefix; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.prefix; import java.io.IOException; import java.util.Arrays; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/PointPrefixTreeFieldCacheProvider.java b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/PointPrefixTreeFieldCacheProvider.java index 2867600d1ad..165c4188544 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/PointPrefixTreeFieldCacheProvider.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/PointPrefixTreeFieldCacheProvider.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.prefix; - /* * 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.lucene.spatial.prefix; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.prefix; import com.spatial4j.core.shape.Point; import org.apache.lucene.spatial.prefix.tree.Cell; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixTreeFacetCounter.java b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixTreeFacetCounter.java index 1f0aa177767..59f43e09c02 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixTreeFacetCounter.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixTreeFacetCounter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.prefix; - /* * 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.lucene.spatial.prefix; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.prefix; import java.io.IOException; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixTreeStrategy.java b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixTreeStrategy.java index 35b9aa1a2bd..608879be4ee 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixTreeStrategy.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixTreeStrategy.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.prefix; - /* * 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.lucene.spatial.prefix; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.prefix; import java.io.IOException; import java.util.Iterator; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/RecursivePrefixTreeStrategy.java b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/RecursivePrefixTreeStrategy.java index 80c193b7061..575b6c9fd30 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/RecursivePrefixTreeStrategy.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/RecursivePrefixTreeStrategy.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.prefix; - /* * 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.lucene.spatial.prefix; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.prefix; import java.util.ArrayList; import java.util.Iterator; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/TermQueryPrefixTreeStrategy.java b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/TermQueryPrefixTreeStrategy.java index 9467628a4bb..a74786bc7e5 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/TermQueryPrefixTreeStrategy.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/TermQueryPrefixTreeStrategy.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.prefix; - /* * 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.lucene.spatial.prefix; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.prefix; import java.util.ArrayList; import java.util.List; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/WithinPrefixTreeQuery.java b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/WithinPrefixTreeQuery.java index 298b5c3aa29..c534a5ba353 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/WithinPrefixTreeQuery.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/WithinPrefixTreeQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.prefix; - /* * 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.lucene.spatial.prefix; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.prefix; import java.io.IOException; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/package-info.java b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/package-info.java index dcccdc3e6d5..656c474e965 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/package-info.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Prefix Tree Strategy. */ diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/Cell.java b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/Cell.java index 0d8139e7791..fe3846d1605 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/Cell.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/Cell.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.prefix.tree; - /* * 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.lucene.spatial.prefix.tree; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.prefix.tree; import com.spatial4j.core.shape.Shape; import com.spatial4j.core.shape.SpatialRelation; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/CellIterator.java b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/CellIterator.java index 42e02595cc3..1cef37a8578 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/CellIterator.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/CellIterator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.prefix.tree; - /* * 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.lucene.spatial.prefix.tree; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.prefix.tree; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/DateRangePrefixTree.java b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/DateRangePrefixTree.java index 155583e71e1..13281f3134f 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/DateRangePrefixTree.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/DateRangePrefixTree.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.prefix.tree; - /* * 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.lucene.spatial.prefix.tree; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.prefix.tree; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/FilterCellIterator.java b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/FilterCellIterator.java index 24d7d12004b..e4f50e05d67 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/FilterCellIterator.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/FilterCellIterator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.prefix.tree; - /* * 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.lucene.spatial.prefix.tree; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.prefix.tree; import com.spatial4j.core.shape.Shape; import com.spatial4j.core.shape.SpatialRelation; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/GeohashPrefixTree.java b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/GeohashPrefixTree.java index e508be059e8..fa4e98745ec 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/GeohashPrefixTree.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/GeohashPrefixTree.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.prefix.tree; - /* * 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.lucene.spatial.prefix.tree; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.prefix.tree; import java.util.ArrayList; import java.util.Collection; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/LegacyCell.java b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/LegacyCell.java index f6a4770345f..27c56a76395 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/LegacyCell.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/LegacyCell.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.prefix.tree; - /* * 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.lucene.spatial.prefix.tree; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.prefix.tree; import java.util.Collection; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/LegacyPrefixTree.java b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/LegacyPrefixTree.java index db7a4e0b81a..672c2fe04c7 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/LegacyPrefixTree.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/LegacyPrefixTree.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.prefix.tree; - /* * 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.lucene.spatial.prefix.tree; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.prefix.tree; import java.util.Arrays; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/NumberRangePrefixTree.java b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/NumberRangePrefixTree.java index d8efe3cd424..40e80bcc7d7 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/NumberRangePrefixTree.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/NumberRangePrefixTree.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.prefix.tree; - /* * 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.lucene.spatial.prefix.tree; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.prefix.tree; import java.text.ParseException; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/PackedQuadPrefixTree.java b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/PackedQuadPrefixTree.java index 71508cc5075..6fe2bffea6f 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/PackedQuadPrefixTree.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/PackedQuadPrefixTree.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.prefix.tree; - /* * 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.lucene.spatial.prefix.tree; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.prefix.tree; import java.util.ArrayList; import java.util.Collection; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/QuadPrefixTree.java b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/QuadPrefixTree.java index 99204abbfa0..48dac871423 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/QuadPrefixTree.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/QuadPrefixTree.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.prefix.tree; - /* * 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.lucene.spatial.prefix.tree; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.prefix.tree; import java.io.PrintStream; import java.text.NumberFormat; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/SingletonCellIterator.java b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/SingletonCellIterator.java index d9d37a551d6..177b431ba79 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/SingletonCellIterator.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/SingletonCellIterator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.prefix.tree; - /* * 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.lucene.spatial.prefix.tree; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.prefix.tree; /** * A singleton (one Cell) instance of CellIterator. diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTree.java b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTree.java index d912a66c029..8ead954d66c 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTree.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTree.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.prefix.tree; - /* * 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.lucene.spatial.prefix.tree; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.prefix.tree; import com.spatial4j.core.context.SpatialContext; import com.spatial4j.core.shape.Shape; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTreeFactory.java b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTreeFactory.java index dd9aa1fb914..b74dc93bded 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTreeFactory.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTreeFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.spatial.prefix.tree; import java.util.Map; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/TreeCellIterator.java b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/TreeCellIterator.java index f5e4a76de55..3ec56aca3b8 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/TreeCellIterator.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/TreeCellIterator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.prefix.tree; - /* * 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.lucene.spatial.prefix.tree; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.prefix.tree; import com.spatial4j.core.shape.Point; import com.spatial4j.core.shape.Shape; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/package-info.java b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/package-info.java index 4dd85b12826..c1419ad9b19 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/package-info.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * This package is about SpatialPrefixTree and any supporting classes. * A SpatialPrefixTree supports spatial indexing by index-time tokens diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/query/SpatialArgs.java b/lucene/spatial/src/java/org/apache/lucene/spatial/query/SpatialArgs.java index 5501d5cad10..0503072cd28 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/query/SpatialArgs.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/query/SpatialArgs.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.query; - /* * 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.lucene.spatial.query; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.query; import com.spatial4j.core.context.SpatialContext; import com.spatial4j.core.shape.Point; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/query/SpatialArgsParser.java b/lucene/spatial/src/java/org/apache/lucene/spatial/query/SpatialArgsParser.java index 6e20814e053..81612fff585 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/query/SpatialArgsParser.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/query/SpatialArgsParser.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.query; - /* * 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.lucene.spatial.query; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.query; import com.spatial4j.core.context.SpatialContext; import com.spatial4j.core.exception.InvalidShapeException; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/query/SpatialOperation.java b/lucene/spatial/src/java/org/apache/lucene/spatial/query/SpatialOperation.java index 753a064c663..7d750ac6ff9 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/query/SpatialOperation.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/query/SpatialOperation.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.query; - /* * 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.lucene.spatial.query; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.query; import com.spatial4j.core.shape.Rectangle; import com.spatial4j.core.shape.Shape; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/query/UnsupportedSpatialOperation.java b/lucene/spatial/src/java/org/apache/lucene/spatial/query/UnsupportedSpatialOperation.java index 7ac239c3775..d6cb152b4c1 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/query/UnsupportedSpatialOperation.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/query/UnsupportedSpatialOperation.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.query; - /* * 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.lucene.spatial.query; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.query; /** * Exception thrown when the {@link org.apache.lucene.spatial.SpatialStrategy} cannot implement the requested operation. diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/query/package-info.java b/lucene/spatial/src/java/org/apache/lucene/spatial/query/package-info.java index 42a5036b411..75ee6809014 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/query/package-info.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/query/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Spatial Query options useful for client side requests */ diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/serialized/SerializedDVStrategy.java b/lucene/spatial/src/java/org/apache/lucene/spatial/serialized/SerializedDVStrategy.java index ec75a6f33f9..c54cf75f3eb 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/serialized/SerializedDVStrategy.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/serialized/SerializedDVStrategy.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.serialized; - /* * 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.lucene.spatial.serialized; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.serialized; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/serialized/package-info.java b/lucene/spatial/src/java/org/apache/lucene/spatial/serialized/package-info.java index 7a316d9d461..353dcdd22b7 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/serialized/package-info.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/serialized/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Strategies that serialize the shape (non-indexed). */ diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/Geo3dShape.java b/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/Geo3dShape.java index 19118a5de6b..bcfc9faf019 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/Geo3dShape.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/Geo3dShape.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.spatial4j; - /* * 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.lucene.spatial.spatial4j; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.spatial4j; import com.spatial4j.core.context.SpatialContext; import com.spatial4j.core.distance.DistanceUtils; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/package-info.java b/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/package-info.java index 7815318b530..f4585c89fbc 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/package-info.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/package-info.java @@ -14,6 +14,5 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** Spatial4j stuff that ideally belongs in Spatial4j (isn't related to Lucene). */ package org.apache.lucene.spatial.spatial4j; \ No newline at end of file diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/util/CachingDoubleValueSource.java b/lucene/spatial/src/java/org/apache/lucene/spatial/util/CachingDoubleValueSource.java index 9a91782ab42..73d25caa0fa 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/util/CachingDoubleValueSource.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/util/CachingDoubleValueSource.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.spatial.util; import org.apache.lucene.index.LeafReaderContext; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/util/DistanceToShapeValueSource.java b/lucene/spatial/src/java/org/apache/lucene/spatial/util/DistanceToShapeValueSource.java index 703586b118c..57cad87f97b 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/util/DistanceToShapeValueSource.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/util/DistanceToShapeValueSource.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 @@ -16,6 +14,7 @@ package org.apache.lucene.spatial.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.util; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapeAreaValueSource.java b/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapeAreaValueSource.java index b08260ab8a9..dd391d1fc96 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapeAreaValueSource.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapeAreaValueSource.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 @@ -16,6 +14,7 @@ package org.apache.lucene.spatial.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.util; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCache.java b/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCache.java index e26f29046a9..480369bcd82 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCache.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCache.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.spatial.util; import com.spatial4j.core.shape.Shape; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCacheDistanceValueSource.java b/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCacheDistanceValueSource.java index 198b062f48b..e4cb1463672 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCacheDistanceValueSource.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCacheDistanceValueSource.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 @@ -16,6 +14,7 @@ package org.apache.lucene.spatial.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.util; import com.spatial4j.core.context.SpatialContext; import com.spatial4j.core.distance.DistanceCalculator; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCacheProvider.java b/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCacheProvider.java index a57460deb0f..04c52f79a67 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCacheProvider.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapeFieldCacheProvider.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.spatial.util; import com.spatial4j.core.shape.Shape; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapePredicateValueSource.java b/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapePredicateValueSource.java index 018b7caaf49..b1dfaaaf569 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapePredicateValueSource.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapePredicateValueSource.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 @@ -16,6 +14,7 @@ package org.apache.lucene.spatial.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.util; import com.spatial4j.core.shape.Shape; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/util/package-info.java b/lucene/spatial/src/java/org/apache/lucene/spatial/util/package-info.java index 3d14591ebd7..39c3c40139e 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/util/package-info.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/util/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Various spatial utilities. */ diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/vector/DistanceValueSource.java b/lucene/spatial/src/java/org/apache/lucene/spatial/vector/DistanceValueSource.java index 85afeae844c..d31fd594466 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/vector/DistanceValueSource.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/vector/DistanceValueSource.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.vector; - /* * 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.lucene.spatial.vector; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.vector; import com.spatial4j.core.distance.DistanceCalculator; import com.spatial4j.core.shape.Point; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/vector/PointVectorStrategy.java b/lucene/spatial/src/java/org/apache/lucene/spatial/vector/PointVectorStrategy.java index 13b2cfd5085..d046e248841 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/vector/PointVectorStrategy.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/vector/PointVectorStrategy.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.vector; - /* * 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.lucene.spatial.vector; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.vector; import com.spatial4j.core.context.SpatialContext; import com.spatial4j.core.shape.Circle; diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/vector/package-info.java b/lucene/spatial/src/java/org/apache/lucene/spatial/vector/package-info.java index 990f8bdc909..47c208cbc51 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/vector/package-info.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/vector/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Spatial strategy that uses two fields. */ diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/DistanceStrategyTest.java b/lucene/spatial/src/test/org/apache/lucene/spatial/DistanceStrategyTest.java index 9046b3b310a..9a29677c6e7 100644 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/DistanceStrategyTest.java +++ b/lucene/spatial/src/test/org/apache/lucene/spatial/DistanceStrategyTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial; - /* * 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.lucene.spatial; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/PortedSolr3Test.java b/lucene/spatial/src/test/org/apache/lucene/spatial/PortedSolr3Test.java index bd2f9bacda8..8506c868dde 100644 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/PortedSolr3Test.java +++ b/lucene/spatial/src/test/org/apache/lucene/spatial/PortedSolr3Test.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial; - /* * 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.lucene.spatial; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial; import java.util.ArrayList; import java.util.HashSet; diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/QueryEqualsHashCodeTest.java b/lucene/spatial/src/test/org/apache/lucene/spatial/QueryEqualsHashCodeTest.java index e94c9db7e18..b1a5e542fc5 100644 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/QueryEqualsHashCodeTest.java +++ b/lucene/spatial/src/test/org/apache/lucene/spatial/QueryEqualsHashCodeTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial; - /* * 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.lucene.spatial; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial; import java.util.ArrayList; import java.util.Collection; diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialArgsTest.java b/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialArgsTest.java index 025e7ecdccf..09b5d466626 100644 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialArgsTest.java +++ b/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialArgsTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial; - /* * 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.lucene.spatial; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial; import com.spatial4j.core.context.SpatialContext; import com.spatial4j.core.shape.Shape; diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialExample.java b/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialExample.java index 89435de5bf0..1bd715969c0 100644 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialExample.java +++ b/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialExample.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial; - /* * 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.lucene.spatial; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial; import java.io.IOException; diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialMatchConcern.java b/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialMatchConcern.java index bff21adf7aa..e995ee18987 100644 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialMatchConcern.java +++ b/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialMatchConcern.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.spatial; public class SpatialMatchConcern { diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialTestCase.java b/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialTestCase.java index 654f6f436ee..31b57f969d1 100644 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialTestCase.java +++ b/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialTestCase.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial; - /* * 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.lucene.spatial; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialTestData.java b/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialTestData.java index fdf13cd7ec5..27d47b33364 100644 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialTestData.java +++ b/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialTestData.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial; - /* * 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.lucene.spatial; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial; import com.spatial4j.core.context.SpatialContext; import com.spatial4j.core.shape.Shape; diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialTestQuery.java b/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialTestQuery.java index a73baa9585a..bac90cf45ca 100644 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialTestQuery.java +++ b/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialTestQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial; - /* * 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.lucene.spatial; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial; import com.spatial4j.core.context.SpatialContext; diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/StrategyTestCase.java b/lucene/spatial/src/test/org/apache/lucene/spatial/StrategyTestCase.java index 706804c5a3f..00e437b857d 100644 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/StrategyTestCase.java +++ b/lucene/spatial/src/test/org/apache/lucene/spatial/StrategyTestCase.java @@ -1,6 +1,3 @@ -package org.apache.lucene.spatial; - - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +14,8 @@ package org.apache.lucene.spatial; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial; + import java.io.FileNotFoundException; import java.io.IOException; diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/TestTestFramework.java b/lucene/spatial/src/test/org/apache/lucene/spatial/TestTestFramework.java index 82c5aa86505..6a8d59c4d60 100644 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/TestTestFramework.java +++ b/lucene/spatial/src/test/org/apache/lucene/spatial/TestTestFramework.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial; - /* * 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.lucene.spatial; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial; import com.spatial4j.core.context.SpatialContext; import com.spatial4j.core.shape.Rectangle; diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/bbox/TestBBoxStrategy.java b/lucene/spatial/src/test/org/apache/lucene/spatial/bbox/TestBBoxStrategy.java index f24554dd6d3..6140996637e 100644 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/bbox/TestBBoxStrategy.java +++ b/lucene/spatial/src/test/org/apache/lucene/spatial/bbox/TestBBoxStrategy.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.bbox; - /* * 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.lucene.spatial.bbox; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.bbox; import java.io.IOException; diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/composite/CompositeStrategyTest.java b/lucene/spatial/src/test/org/apache/lucene/spatial/composite/CompositeStrategyTest.java index 80736dbb8ab..8e1bb513c46 100644 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/composite/CompositeStrategyTest.java +++ b/lucene/spatial/src/test/org/apache/lucene/spatial/composite/CompositeStrategyTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.composite; - /* * 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.lucene.spatial.composite; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.composite; import java.io.IOException; diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/CellToBytesRefIterator50.java b/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/CellToBytesRefIterator50.java index 2654122ed90..cccec8e1f10 100644 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/CellToBytesRefIterator50.java +++ b/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/CellToBytesRefIterator50.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.prefix; - /* * 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.lucene.spatial.prefix; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.prefix; import org.apache.lucene.spatial.prefix.tree.Cell; import org.apache.lucene.util.BytesRef; diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/DateNRStrategyTest.java b/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/DateNRStrategyTest.java index 93579883a1c..7cd4723d5b6 100644 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/DateNRStrategyTest.java +++ b/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/DateNRStrategyTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.prefix; - /* * 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.lucene.spatial.prefix; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.prefix; import java.io.IOException; import java.util.Calendar; diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/HeatmapFacetCounterTest.java b/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/HeatmapFacetCounterTest.java index f6f1f0bbfc6..124af79041b 100644 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/HeatmapFacetCounterTest.java +++ b/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/HeatmapFacetCounterTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.prefix; - /* * 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.lucene.spatial.prefix; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.prefix; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/JtsPolygonTest.java b/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/JtsPolygonTest.java index 87b05112957..62b0466570f 100644 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/JtsPolygonTest.java +++ b/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/JtsPolygonTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.prefix; - /* * 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.lucene.spatial.prefix; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.prefix; import com.spatial4j.core.context.SpatialContextFactory; import com.spatial4j.core.shape.Point; diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/NumberRangeFacetsTest.java b/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/NumberRangeFacetsTest.java index 6cd84c82fd3..11e1d18701c 100644 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/NumberRangeFacetsTest.java +++ b/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/NumberRangeFacetsTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.prefix; - /* * 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.lucene.spatial.prefix; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.prefix; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/RandomSpatialOpFuzzyPrefixTree50Test.java b/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/RandomSpatialOpFuzzyPrefixTree50Test.java index e5c979d1ad9..e932fe91139 100644 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/RandomSpatialOpFuzzyPrefixTree50Test.java +++ b/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/RandomSpatialOpFuzzyPrefixTree50Test.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.prefix; - /* * 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.lucene.spatial.prefix; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.prefix; /** Test RandomSpatialOpFuzzyPrefixTreeTest using the PrefixTree index format found in 5.0 and prior. */ public class RandomSpatialOpFuzzyPrefixTree50Test extends RandomSpatialOpFuzzyPrefixTreeTest { diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/RandomSpatialOpFuzzyPrefixTreeTest.java b/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/RandomSpatialOpFuzzyPrefixTreeTest.java index 3be78296087..8db131c84a6 100644 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/RandomSpatialOpFuzzyPrefixTreeTest.java +++ b/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/RandomSpatialOpFuzzyPrefixTreeTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.prefix; - /* * 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.lucene.spatial.prefix; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.prefix; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/RandomSpatialOpStrategyTestCase.java b/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/RandomSpatialOpStrategyTestCase.java index 41806635a1e..87f1071503c 100644 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/RandomSpatialOpStrategyTestCase.java +++ b/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/RandomSpatialOpStrategyTestCase.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.prefix; - /* * 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.lucene.spatial.prefix; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.prefix; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/TestRecursivePrefixTreeStrategy.java b/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/TestRecursivePrefixTreeStrategy.java index c2f35284de2..a53d52dee7a 100644 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/TestRecursivePrefixTreeStrategy.java +++ b/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/TestRecursivePrefixTreeStrategy.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.prefix; - /* * 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.lucene.spatial.prefix; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.prefix; import com.spatial4j.core.context.SpatialContext; import com.spatial4j.core.distance.DistanceUtils; diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/TestTermQueryPrefixGridStrategy.java b/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/TestTermQueryPrefixGridStrategy.java index 97c2690061d..1a912c04620 100644 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/TestTermQueryPrefixGridStrategy.java +++ b/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/TestTermQueryPrefixGridStrategy.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.prefix; - /* * 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.lucene.spatial.prefix; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.prefix; import com.spatial4j.core.context.SpatialContext; import com.spatial4j.core.shape.Shape; diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/tree/DateRangePrefixTreeTest.java b/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/tree/DateRangePrefixTreeTest.java index 949d2dd0fbd..74a989efb24 100644 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/tree/DateRangePrefixTreeTest.java +++ b/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/tree/DateRangePrefixTreeTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.prefix.tree; - /* * 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.lucene.spatial.prefix.tree; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.prefix.tree; import java.text.ParseException; import java.util.Arrays; diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTreeTest.java b/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTreeTest.java index 89b0c7223c3..9f6c6250f5a 100644 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTreeTest.java +++ b/lucene/spatial/src/test/org/apache/lucene/spatial/prefix/tree/SpatialPrefixTreeTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.prefix.tree; - /* * 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.lucene.spatial.prefix.tree; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.prefix.tree; import com.spatial4j.core.context.SpatialContext; import com.spatial4j.core.shape.Point; diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/query/SpatialArgsParserTest.java b/lucene/spatial/src/test/org/apache/lucene/spatial/query/SpatialArgsParserTest.java index 54884e59768..b7bd50dc9ba 100644 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/query/SpatialArgsParserTest.java +++ b/lucene/spatial/src/test/org/apache/lucene/spatial/query/SpatialArgsParserTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.query; - /* * 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.lucene.spatial.query; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.query; import com.spatial4j.core.context.SpatialContext; import com.spatial4j.core.shape.Rectangle; diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/serialized/SerializedStrategyTest.java b/lucene/spatial/src/test/org/apache/lucene/spatial/serialized/SerializedStrategyTest.java index 8ed59da5b5b..bed83393940 100644 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/serialized/SerializedStrategyTest.java +++ b/lucene/spatial/src/test/org/apache/lucene/spatial/serialized/SerializedStrategyTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.serialized; - /* * 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.lucene.spatial.serialized; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.serialized; import java.io.IOException; diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/Geo3dRptTest.java b/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/Geo3dRptTest.java index d659534b9c7..7c98d024439 100644 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/Geo3dRptTest.java +++ b/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/Geo3dRptTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.spatial4j; - /* * 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.lucene.spatial.spatial4j; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.spatial4j; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeRectRelationTestCase.java b/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeRectRelationTestCase.java index 47d8e32d250..3113aed5fd6 100644 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeRectRelationTestCase.java +++ b/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeRectRelationTestCase.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.spatial4j; - /* * 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.lucene.spatial.spatial4j; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.spatial4j; import java.util.ArrayList; import java.util.List; diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeSphereModelRectRelationTest.java b/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeSphereModelRectRelationTest.java index 1d012030b36..aac0a0a0414 100644 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeSphereModelRectRelationTest.java +++ b/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeSphereModelRectRelationTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.spatial4j; - /* * 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.lucene.spatial.spatial4j; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.spatial4j; import java.util.ArrayList; import java.util.List; diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeWGS84ModelRectRelationTest.java b/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeWGS84ModelRectRelationTest.java index c063d1bb5c8..a9ff58d020b 100644 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeWGS84ModelRectRelationTest.java +++ b/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/Geo3dShapeWGS84ModelRectRelationTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.spatial4j; - /* * 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.lucene.spatial.spatial4j; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.spatial4j; import org.apache.lucene.geo3d.GeoArea; import org.apache.lucene.geo3d.GeoBBox; diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/RandomizedShapeTestCase.java b/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/RandomizedShapeTestCase.java index 6d8d599bf7b..db725206fe0 100644 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/RandomizedShapeTestCase.java +++ b/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/RandomizedShapeTestCase.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.spatial4j; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,7 +14,7 @@ package org.apache.lucene.spatial.spatial4j; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.spatial.spatial4j; import com.spatial4j.core.context.SpatialContext; import com.spatial4j.core.distance.DistanceUtils; diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/geo3d/GeoPointTest.java b/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/geo3d/GeoPointTest.java index 0fcb55c3f31..e652581df1a 100644 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/geo3d/GeoPointTest.java +++ b/lucene/spatial/src/test/org/apache/lucene/spatial/spatial4j/geo3d/GeoPointTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.spatial4j.geo3d; - /* * 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.lucene.spatial.spatial4j.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.spatial4j.geo3d; import org.apache.lucene.geo3d.GeoPoint; import org.apache.lucene.geo3d.PlanetModel; diff --git a/lucene/spatial/src/test/org/apache/lucene/spatial/vector/TestPointVectorStrategy.java b/lucene/spatial/src/test/org/apache/lucene/spatial/vector/TestPointVectorStrategy.java index e10fe7d583f..d62a0a8231f 100644 --- a/lucene/spatial/src/test/org/apache/lucene/spatial/vector/TestPointVectorStrategy.java +++ b/lucene/spatial/src/test/org/apache/lucene/spatial/vector/TestPointVectorStrategy.java @@ -1,5 +1,3 @@ -package org.apache.lucene.spatial.vector; - /* * 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.lucene.spatial.vector; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.spatial.vector; import com.spatial4j.core.context.SpatialContext; import com.spatial4j.core.shape.Circle; diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/ArcDistance.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/ArcDistance.java index 62235028adc..c49fd1fe1ca 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/ArcDistance.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/ArcDistance.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * Arc distance computation style. diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/BasePlanetObject.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/BasePlanetObject.java index 5e2481b4e9c..b5e3d286adb 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/BasePlanetObject.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/BasePlanetObject.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * All Geo3D shapes can derive from this base class, which furnishes diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/BaseXYZSolid.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/BaseXYZSolid.java index 3ac415eaf3d..52bd5da6209 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/BaseXYZSolid.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/BaseXYZSolid.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * Base class of a family of 3D rectangles, bounded on six sides by X,Y,Z limits diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Bounds.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Bounds.java index 3c7ceda3248..67172205f9b 100755 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Bounds.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Bounds.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * An interface for accumulating bounds information. diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/DistanceStyle.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/DistanceStyle.java index a6e3836679d..28056cb1841 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/DistanceStyle.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/DistanceStyle.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * Distance computation styles, supporting various ways of computing diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Geo3DPoint.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Geo3DPoint.java index b3ca7f6e6b3..ce36c20066f 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Geo3DPoint.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Geo3DPoint.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; import org.apache.lucene.document.Field; import org.apache.lucene.document.FieldType; diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Geo3DUtil.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Geo3DUtil.java index 10076cdc919..34880a139ee 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Geo3DUtil.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Geo3DUtil.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; class Geo3DUtil { diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoArea.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoArea.java index 5c99e40d547..424e494ec14 100755 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoArea.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoArea.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * A GeoArea represents a standard 2-D breakdown of a part of sphere. It can diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoAreaFactory.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoAreaFactory.java index c5a0f96ef6c..24dd211f1f2 100755 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoAreaFactory.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoAreaFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * Factory for {@link org.apache.lucene.geo3d.GeoArea}. diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBBox.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBBox.java index bf2b2137513..10a2388e955 100755 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBBox.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBBox.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * All bounding box shapes have this interface in common. diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBBoxFactory.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBBoxFactory.java index e0432df74a5..9a02ab9d28e 100755 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBBoxFactory.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBBoxFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * Factory for {@link org.apache.lucene.geo3d.GeoBBox}. diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBaseBBox.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBaseBBox.java index 205aaeb9d40..f40a0a14215 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBaseBBox.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBaseBBox.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * All bounding box shapes can derive from this base class, which furnishes diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBaseCircle.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBaseCircle.java index 205d9f58aa0..8c306d7ac4c 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBaseCircle.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBaseCircle.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * GeoCircles have all the characteristics of GeoBaseDistanceShapes, plus GeoSizeable. diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBaseDistanceShape.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBaseDistanceShape.java index b8760d14b17..1c8306adb4a 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBaseDistanceShape.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBaseDistanceShape.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * Distance shapes have capabilities of both geohashing and distance diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBaseMembershipShape.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBaseMembershipShape.java index 3868b8fa6df..a6bba8f4063 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBaseMembershipShape.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBaseMembershipShape.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * Membership shapes have capabilities of both geohashing and membership diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBasePolygon.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBasePolygon.java index fb09604182d..50ad0dcc9ca 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBasePolygon.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBasePolygon.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * GeoBasePolygon objects are the base class of most GeoPolygon objects. diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBaseShape.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBaseShape.java index 1aac4310745..146cfe85714 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBaseShape.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoBaseShape.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * Base extended shape object. diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoCircle.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoCircle.java index f5d8b29f45a..154cdc4c084 100755 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoCircle.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoCircle.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * Interface describing circular area with a center and radius. diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoCircleFactory.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoCircleFactory.java index e27ee45d3a0..2bb8ffc97fa 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoCircleFactory.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoCircleFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * Class which constructs a GeoCircle representing an arbitrary circle. diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoCompositeMembershipShape.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoCompositeMembershipShape.java index 2f9100b7db5..25bdda096a1 100755 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoCompositeMembershipShape.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoCompositeMembershipShape.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; import java.util.ArrayList; import java.util.List; diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoCompositePolygon.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoCompositePolygon.java index 0d0595157a5..b537590658b 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoCompositePolygon.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoCompositePolygon.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * GeoCompositePolygon is a specific implementation of GeoMembershipShape, which implements GeoPolygon explicitly. diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoConvexPolygon.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoConvexPolygon.java index 2dc7e0217ea..fc07c4bb4ad 100755 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoConvexPolygon.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoConvexPolygon.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; import java.util.ArrayList; import java.util.BitSet; diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDegenerateHorizontalLine.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDegenerateHorizontalLine.java index c0a7740d36b..6644f0db2b8 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDegenerateHorizontalLine.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDegenerateHorizontalLine.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * Degenerate bounding box limited on two sides (left lon, right lon). diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDegenerateLatitudeZone.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDegenerateLatitudeZone.java index bc3a4bc98bc..48907338914 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDegenerateLatitudeZone.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDegenerateLatitudeZone.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * This GeoBBox represents an area rectangle of one specific latitude with diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDegenerateLongitudeSlice.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDegenerateLongitudeSlice.java index 6d7468462fb..b5eb90237de 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDegenerateLongitudeSlice.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDegenerateLongitudeSlice.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * Degenerate longitude slice. diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDegeneratePoint.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDegeneratePoint.java index 79fef8659bf..63670d7f83b 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDegeneratePoint.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDegeneratePoint.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,7 +14,8 @@ package org.apache.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.geo3d; + /** * This class represents a degenerate point bounding box. * It is not a simple GeoPoint because we must have the latitude and longitude. diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDegenerateVerticalLine.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDegenerateVerticalLine.java index 7a93613d776..f21f7747d04 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDegenerateVerticalLine.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDegenerateVerticalLine.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * Degenerate bounding box limited on two sides (top lat, bottom lat). diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDistance.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDistance.java index 87d1d54756a..899a687b431 100755 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDistance.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDistance.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * An implementer of this interface is capable of computing the described "distance" values, diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDistanceShape.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDistanceShape.java index 253afce94f4..1e82f482825 100755 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDistanceShape.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoDistanceShape.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * Distance shapes have capabilities of both geohashing and distance diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoLatitudeZone.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoLatitudeZone.java index 16201bf55ab..3fc4423ec24 100755 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoLatitudeZone.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoLatitudeZone.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * This GeoBBox represents an area rectangle limited only in latitude. diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoLongitudeSlice.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoLongitudeSlice.java index e32316c16be..f5de7e766c8 100755 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoLongitudeSlice.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoLongitudeSlice.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * Bounding box limited on left and right. diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoMembershipShape.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoMembershipShape.java index 0b5b090cc91..54b25513c55 100755 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoMembershipShape.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoMembershipShape.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * Membership shapes have capabilities of both geohashing and membership diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoNorthLatitudeZone.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoNorthLatitudeZone.java index e54f3a1f7b2..43338bbd688 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoNorthLatitudeZone.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoNorthLatitudeZone.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * This GeoBBox represents an area rectangle limited only in south latitude. diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoNorthRectangle.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoNorthRectangle.java index 6d713c67e80..66b9480d681 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoNorthRectangle.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoNorthRectangle.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * Bounding box limited on three sides (bottom lat, left lon, right lon), including diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoOutsideDistance.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoOutsideDistance.java index 79630b7bee9..c1d784d387f 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoOutsideDistance.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoOutsideDistance.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * Implemented by Geo3D shapes that can compute the distance from a point to the closest outside edge. diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoPath.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoPath.java index 0e727dc06e3..bc5b9cf3f5a 100755 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoPath.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoPath.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; import java.util.ArrayList; import java.util.Collections; diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoPoint.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoPoint.java index 4225e1903c4..e8a265d40a1 100755 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoPoint.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoPoint.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,7 +14,8 @@ package org.apache.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.geo3d; + /** * This class represents a point on the surface of a sphere or ellipsoid. * diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoPolygon.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoPolygon.java index 35fd919c392..634406d785c 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoPolygon.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoPolygon.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * GeoPolygon interface description. diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoPolygonFactory.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoPolygonFactory.java index b63b73e3cdb..0dc70a5ebf6 100755 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoPolygonFactory.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoPolygonFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; import java.util.ArrayList; import java.util.BitSet; diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoRectangle.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoRectangle.java index f1ef7debc62..fc2a531f252 100755 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoRectangle.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoRectangle.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * Bounding box limited on four sides (top lat, bottom lat, left lon, right lon). diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoShape.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoShape.java index 1605fbecea2..21cdba3b9c7 100755 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoShape.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoShape.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * Generic shape. This describes methods that help GeoAreas figure out diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoSizeable.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoSizeable.java index b9aba9b127c..e8c0ebb2e5a 100755 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoSizeable.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoSizeable.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * Some shapes can compute radii of a geocircle in which they are inscribed. diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoSouthLatitudeZone.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoSouthLatitudeZone.java index 95e8703ee5f..439dc1b96b8 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoSouthLatitudeZone.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoSouthLatitudeZone.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * This GeoBBox represents an area rectangle limited only in north latitude. diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoSouthRectangle.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoSouthRectangle.java index cf744191171..eb6526be983 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoSouthRectangle.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoSouthRectangle.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * Bounding box limited on three sides (top lat, left lon, right lon). The diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoStandardCircle.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoStandardCircle.java index d90908ee770..0304d532f8a 100755 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoStandardCircle.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoStandardCircle.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * Circular area with a center and radius. diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoWideDegenerateHorizontalLine.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoWideDegenerateHorizontalLine.java index 7f6a147cf48..a9af5b2f60b 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoWideDegenerateHorizontalLine.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoWideDegenerateHorizontalLine.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * Degenerate bounding box wider than PI and limited on two sides (left lon, right lon). diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoWideLongitudeSlice.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoWideLongitudeSlice.java index 144324810c1..64e4fa8b091 100755 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoWideLongitudeSlice.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoWideLongitudeSlice.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * Bounding box wider than PI but limited on left and right sides ( diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoWideNorthRectangle.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoWideNorthRectangle.java index 51e81ac3e38..86de58420f9 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoWideNorthRectangle.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoWideNorthRectangle.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * Bounding box wider than PI but limited on three sides ( diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoWideRectangle.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoWideRectangle.java index 851c55f13ae..68397bba473 100755 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoWideRectangle.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoWideRectangle.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * Bounding box wider than PI but limited on four sides (top lat, diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoWideSouthRectangle.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoWideSouthRectangle.java index 35bdc731d54..8bd72206551 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoWideSouthRectangle.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoWideSouthRectangle.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * Bounding box wider than PI but limited on three sides (top lat, diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoWorld.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoWorld.java index 48e22ee9ddf..35ec4ae2d9f 100755 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoWorld.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/GeoWorld.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * Bounding box including the entire world. diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/LatLonBounds.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/LatLonBounds.java index 158076fe67e..6478e0cc79b 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/LatLonBounds.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/LatLonBounds.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * An object for accumulating latitude/longitude bounds information. diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/LinearDistance.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/LinearDistance.java index 8fab628ee99..9cbedba4b41 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/LinearDistance.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/LinearDistance.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * Linear distance computation style. diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/LinearSquaredDistance.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/LinearSquaredDistance.java index 82d864de48c..028d3c4222e 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/LinearSquaredDistance.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/LinearSquaredDistance.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * Linear squared distance computation style. diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Membership.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Membership.java index e41d96c4494..3ca6b095ac6 100755 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Membership.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Membership.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * Implemented by Geo3D shapes that can calculate if a point is within it or not. diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/NormalDistance.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/NormalDistance.java index 5de7ff347a8..cdac0d253bb 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/NormalDistance.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/NormalDistance.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * Normal distance computation style. diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/NormalSquaredDistance.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/NormalSquaredDistance.java index 75ccc62d720..035fd40e58c 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/NormalSquaredDistance.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/NormalSquaredDistance.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * Normal squared distance computation style. diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Plane.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Plane.java index 25c8591cc45..07d0c5b5f87 100755 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Plane.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Plane.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * We know about three kinds of planes. First kind: general plain through two points and origin diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/PlanetModel.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/PlanetModel.java index 42944bf12b8..395fa1512b9 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/PlanetModel.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/PlanetModel.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * Holds mathematical constants associated with the model of a planet. diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/PointInGeo3DShapeQuery.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/PointInGeo3DShapeQuery.java index ac8d2272b6c..84ff01b57e1 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/PointInGeo3DShapeQuery.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/PointInGeo3DShapeQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; import java.io.IOException; diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/SidedPlane.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/SidedPlane.java index 3f3e3cdcb18..7fc543d24e5 100755 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/SidedPlane.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/SidedPlane.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * Combination of a plane, and a sign value indicating what evaluation values are on the correct diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/StandardXYZSolid.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/StandardXYZSolid.java index 5b7b69a853a..cd542254cbd 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/StandardXYZSolid.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/StandardXYZSolid.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * 3D rectangle, bounded on six sides by X,Y,Z limits diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Tools.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Tools.java index e2000fa8ad2..89d37aab844 100755 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Tools.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Tools.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * Static methods globally useful for 3d geometric work. diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Vector.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Vector.java index bd1db07d76c..1a3972d3b0c 100755 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Vector.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/Vector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * A 3d vector in space, not necessarily diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/XYZBounds.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/XYZBounds.java index e824acc1271..22e324bb457 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/XYZBounds.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/XYZBounds.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * An object for accumulating XYZ bounds information. diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/XYZSolid.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/XYZSolid.java index 5fe72eb8ae1..ab464029597 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/XYZSolid.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/XYZSolid.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * Interface for a family of 3D rectangles, bounded on six sides by X,Y,Z limits diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/XYZSolidFactory.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/XYZSolidFactory.java index b13a24f8160..409ba86a0ff 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/XYZSolidFactory.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/XYZSolidFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * Factory for {@link org.apache.lucene.geo3d.XYZSolid}. diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/XYdZSolid.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/XYdZSolid.java index 782386eb625..e7cbe25e131 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/XYdZSolid.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/XYdZSolid.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * 3D rectangle, bounded on six sides by X,Y,Z limits, degenerate in Z diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/XdYZSolid.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/XdYZSolid.java index b6837243c88..f6a2fa3931b 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/XdYZSolid.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/XdYZSolid.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * 3D rectangle, bounded on six sides by X,Y,Z limits, degenerate in Y diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/XdYdZSolid.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/XdYdZSolid.java index 507a68380dd..562e5a6aed9 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/XdYdZSolid.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/XdYdZSolid.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * 3D rectangle, bounded on six sides by X,Y,Z limits, degenerate in Y and Z. diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/dXYZSolid.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/dXYZSolid.java index cfea99c1aab..5a2a0063fe9 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/dXYZSolid.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/dXYZSolid.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * 3D rectangle, bounded on six sides by X,Y,Z limits, degenerate in X. diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/dXYdZSolid.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/dXYdZSolid.java index 430a84e4160..96b3004bc5c 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/dXYdZSolid.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/dXYdZSolid.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * 3D rectangle, bounded on six sides by X,Y,Z limits, degenerate in X and Z. diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/dXdYZSolid.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/dXdYZSolid.java index f5bb799407b..b58cd9261c2 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/dXdYZSolid.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/dXdYZSolid.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * 3D rectangle, bounded on six sides by X,Y,Z limits, degenerate in X and Y. diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/dXdYdZSolid.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/dXdYdZSolid.java index e5327ea0a21..b26cf634595 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/dXdYdZSolid.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/dXdYdZSolid.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; /** * 3D rectangle, bounded on six sides by X,Y,Z limits, degenerate in all dimensions diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/package-info.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/package-info.java index 2b6af740b51..4b45d3d933a 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/package-info.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Shapes implemented using 3D planar geometry. */ diff --git a/lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoBBoxTest.java b/lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoBBoxTest.java index 85931ccce9e..b76134e43b3 100755 --- a/lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoBBoxTest.java +++ b/lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoBBoxTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; import java.util.ArrayList; import java.util.List; diff --git a/lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoCircleTest.java b/lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoCircleTest.java index 98122ea7d5e..aa5c2e3325b 100755 --- a/lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoCircleTest.java +++ b/lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoCircleTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; import org.junit.Test; diff --git a/lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoConvexPolygonTest.java b/lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoConvexPolygonTest.java index 6c50d2a3272..d6ca7ba621a 100755 --- a/lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoConvexPolygonTest.java +++ b/lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoConvexPolygonTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; import org.junit.Test; diff --git a/lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoModelTest.java b/lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoModelTest.java index 7f0be1fa39a..b3001d4df83 100644 --- a/lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoModelTest.java +++ b/lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoModelTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; import org.junit.Test; diff --git a/lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoPathTest.java b/lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoPathTest.java index 245964acfd3..fea7ed48ac4 100755 --- a/lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoPathTest.java +++ b/lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoPathTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; import org.junit.Test; diff --git a/lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoPolygonTest.java b/lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoPolygonTest.java index 154b99151f3..f1511b96942 100755 --- a/lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoPolygonTest.java +++ b/lucene/spatial3d/src/test/org/apache/lucene/geo3d/GeoPolygonTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; import java.util.ArrayList; import java.util.List; diff --git a/lucene/spatial3d/src/test/org/apache/lucene/geo3d/PlaneTest.java b/lucene/spatial3d/src/test/org/apache/lucene/geo3d/PlaneTest.java index b01d4059a39..2ac3856bf7e 100644 --- a/lucene/spatial3d/src/test/org/apache/lucene/geo3d/PlaneTest.java +++ b/lucene/spatial3d/src/test/org/apache/lucene/geo3d/PlaneTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; import org.junit.Test; diff --git a/lucene/spatial3d/src/test/org/apache/lucene/geo3d/TestGeo3DPoint.java b/lucene/spatial3d/src/test/org/apache/lucene/geo3d/TestGeo3DPoint.java index 0b7a5de39d7..c495562fb92 100644 --- a/lucene/spatial3d/src/test/org/apache/lucene/geo3d/TestGeo3DPoint.java +++ b/lucene/spatial3d/src/test/org/apache/lucene/geo3d/TestGeo3DPoint.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; import java.io.IOException; import java.io.PrintWriter; diff --git a/lucene/spatial3d/src/test/org/apache/lucene/geo3d/XYZSolidTest.java b/lucene/spatial3d/src/test/org/apache/lucene/geo3d/XYZSolidTest.java index 4654f51ada9..876a5256b11 100644 --- a/lucene/spatial3d/src/test/org/apache/lucene/geo3d/XYZSolidTest.java +++ b/lucene/spatial3d/src/test/org/apache/lucene/geo3d/XYZSolidTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.geo3d; - /* * 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.lucene.geo3d; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.geo3d; import org.apache.lucene.util.LuceneTestCase; import org.junit.Test; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/spell/CombineSuggestion.java b/lucene/suggest/src/java/org/apache/lucene/search/spell/CombineSuggestion.java index e3a6f021033..4a6717755ac 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/spell/CombineSuggestion.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/spell/CombineSuggestion.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spell; - /* * 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.lucene.search.spell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spell; /** *

A suggestion generated by combining one or more original query terms

diff --git a/lucene/suggest/src/java/org/apache/lucene/search/spell/Dictionary.java b/lucene/suggest/src/java/org/apache/lucene/search/spell/Dictionary.java index 59194b84fd7..5814059df2e 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/spell/Dictionary.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/spell/Dictionary.java @@ -1,4 +1,3 @@ -package org.apache.lucene.search.spell; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.search.spell; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.search.spell; import java.io.IOException; import org.apache.lucene.search.suggest.InputIterator; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/spell/DirectSpellChecker.java b/lucene/suggest/src/java/org/apache/lucene/search/spell/DirectSpellChecker.java index 0e5b0ec0ac4..f372382b18d 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/spell/DirectSpellChecker.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/spell/DirectSpellChecker.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spell; - /* * 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.lucene.search.spell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spell; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.MultiFields; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/spell/HighFrequencyDictionary.java b/lucene/suggest/src/java/org/apache/lucene/search/spell/HighFrequencyDictionary.java index be6b94f8d93..657684c587a 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/spell/HighFrequencyDictionary.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/spell/HighFrequencyDictionary.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.lucene.search.spell; import java.io.IOException; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/spell/JaroWinklerDistance.java b/lucene/suggest/src/java/org/apache/lucene/search/spell/JaroWinklerDistance.java index d3d2a7b180b..7f5d1a245f8 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/spell/JaroWinklerDistance.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/spell/JaroWinklerDistance.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spell; - /* * 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.lucene.search.spell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spell; import java.util.Arrays; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/spell/LevensteinDistance.java b/lucene/suggest/src/java/org/apache/lucene/search/spell/LevensteinDistance.java index 5d9ccd4fc4b..de3f587722c 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/spell/LevensteinDistance.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/spell/LevensteinDistance.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spell; - /* * 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.lucene.search.spell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spell; /** * Levenstein edit distance class. diff --git a/lucene/suggest/src/java/org/apache/lucene/search/spell/LuceneDictionary.java b/lucene/suggest/src/java/org/apache/lucene/search/spell/LuceneDictionary.java index ec5ab49a0c8..5612463feb3 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/spell/LuceneDictionary.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/spell/LuceneDictionary.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spell; - /* * 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.lucene.search.spell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spell; import org.apache.lucene.index.IndexReader; import org.apache.lucene.search.suggest.InputIterator; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/spell/LuceneLevenshteinDistance.java b/lucene/suggest/src/java/org/apache/lucene/search/spell/LuceneLevenshteinDistance.java index 6a6ce44cac3..3ba0bd332be 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/spell/LuceneLevenshteinDistance.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/spell/LuceneLevenshteinDistance.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spell; - /* * 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.lucene.search.spell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spell; import org.apache.lucene.util.IntsRef; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/spell/NGramDistance.java b/lucene/suggest/src/java/org/apache/lucene/search/spell/NGramDistance.java index 38cd01a04b2..3625570f137 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/spell/NGramDistance.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/spell/NGramDistance.java @@ -1,21 +1,20 @@ -package org.apache.lucene.search.spell; - /* -* 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. -*/ + * 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.spell; /** * N-Gram version of edit distance based on paper by Grzegorz Kondrak, diff --git a/lucene/suggest/src/java/org/apache/lucene/search/spell/PlainTextDictionary.java b/lucene/suggest/src/java/org/apache/lucene/search/spell/PlainTextDictionary.java index 38b61b534df..7ffa5d09c34 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/spell/PlainTextDictionary.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/spell/PlainTextDictionary.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spell; - /* * 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.lucene.search.spell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spell; import java.io.BufferedReader; import java.io.IOException; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java b/lucene/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java index d90fcf6fb52..1f11e27507c 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spell; - /* * 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.lucene.search.spell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spell; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/spell/StringDistance.java b/lucene/suggest/src/java/org/apache/lucene/search/spell/StringDistance.java index 2731ba083d9..ca09288e4e5 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/spell/StringDistance.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/spell/StringDistance.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spell; - /* * 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.lucene.search.spell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spell; /** * Interface for string distances. diff --git a/lucene/suggest/src/java/org/apache/lucene/search/spell/SuggestMode.java b/lucene/suggest/src/java/org/apache/lucene/search/spell/SuggestMode.java index 7f8990648a9..5e42f1644a5 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/spell/SuggestMode.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/spell/SuggestMode.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spell; - /* * 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.lucene.search.spell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spell; /** * Set of strategies for suggesting related terms diff --git a/lucene/suggest/src/java/org/apache/lucene/search/spell/SuggestWord.java b/lucene/suggest/src/java/org/apache/lucene/search/spell/SuggestWord.java index bfa0aaec770..f61eeadf5b2 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/spell/SuggestWord.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/spell/SuggestWord.java @@ -1,6 +1,3 @@ -package org.apache.lucene.search.spell; - - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +14,8 @@ package org.apache.lucene.search.spell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spell; + /** * SuggestWord, used in suggestSimilar method in SpellChecker class. diff --git a/lucene/suggest/src/java/org/apache/lucene/search/spell/SuggestWordFrequencyComparator.java b/lucene/suggest/src/java/org/apache/lucene/search/spell/SuggestWordFrequencyComparator.java index 67fdc384ac9..7f9c14f2364 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/spell/SuggestWordFrequencyComparator.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/spell/SuggestWordFrequencyComparator.java @@ -1,6 +1,3 @@ -package org.apache.lucene.search.spell; - -import java.util.Comparator; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,8 +14,9 @@ import java.util.Comparator; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spell; - +import java.util.Comparator; /** * Frequency first, then score. * diff --git a/lucene/suggest/src/java/org/apache/lucene/search/spell/SuggestWordQueue.java b/lucene/suggest/src/java/org/apache/lucene/search/spell/SuggestWordQueue.java index e347135c479..b7910b78f49 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/spell/SuggestWordQueue.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/spell/SuggestWordQueue.java @@ -1,6 +1,3 @@ -package org.apache.lucene.search.spell; - - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +14,8 @@ package org.apache.lucene.search.spell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spell; + import org.apache.lucene.util.PriorityQueue; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/spell/SuggestWordScoreComparator.java b/lucene/suggest/src/java/org/apache/lucene/search/spell/SuggestWordScoreComparator.java index 2e125e8c262..f6e7703c8d5 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/spell/SuggestWordScoreComparator.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/spell/SuggestWordScoreComparator.java @@ -1,4 +1,3 @@ -package org.apache.lucene.search.spell; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.search.spell; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.search.spell; import java.util.Comparator; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/spell/WordBreakSpellChecker.java b/lucene/suggest/src/java/org/apache/lucene/search/spell/WordBreakSpellChecker.java index e4309a77d37..191f431bff4 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/spell/WordBreakSpellChecker.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/spell/WordBreakSpellChecker.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spell; - /* * 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.lucene.search.spell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spell; import java.io.IOException; import java.util.Comparator; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/spell/package-info.java b/lucene/suggest/src/java/org/apache/lucene/search/spell/package-info.java index bae3d298bbf..f730bdfc537 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/spell/package-info.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/spell/package-info.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - /** * Suggest alternate spellings for words. * Also see the spell checker Wiki page. diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/BitsProducer.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/BitsProducer.java index a5c5fb0fa1c..7052a314019 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/BitsProducer.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/BitsProducer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest; - /* * 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.lucene.search.suggest; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest; import java.io.IOException; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/BufferedInputIterator.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/BufferedInputIterator.java index 27ce5397751..97bf845159b 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/BufferedInputIterator.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/BufferedInputIterator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest; - /* * 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.lucene.search.suggest; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/DocumentDictionary.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/DocumentDictionary.java index 117621aade3..9006ae261ab 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/DocumentDictionary.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/DocumentDictionary.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest; - /* * 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.lucene.search.suggest; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest; import java.io.IOException; import java.util.Collections; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/DocumentValueSourceDictionary.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/DocumentValueSourceDictionary.java index 021fca960b1..8affcc5e1b3 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/DocumentValueSourceDictionary.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/DocumentValueSourceDictionary.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest; - /* * 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.lucene.search.suggest; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest; import java.io.IOException; import java.util.HashMap; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/FileDictionary.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/FileDictionary.java index 0b7cfeccc76..7d495182fb8 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/FileDictionary.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/FileDictionary.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,7 +14,7 @@ package org.apache.lucene.search.suggest; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.search.suggest; import java.io.*; import java.nio.charset.StandardCharsets; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/InMemorySorter.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/InMemorySorter.java index 42e19a8f9b9..fec615c7255 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/InMemorySorter.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/InMemorySorter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest; - /* * 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.lucene.search.suggest; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest; import java.util.Comparator; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/InputIterator.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/InputIterator.java index 02feb5b8af4..d2224f9679b 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/InputIterator.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/InputIterator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest; - /* * 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.lucene.search.suggest; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest; import java.io.IOException; import java.util.Set; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/Lookup.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/Lookup.java index 8b4b914db1c..138042467f3 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/Lookup.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/Lookup.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest; - /* * 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.lucene.search.suggest; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest; import java.io.IOException; import java.io.InputStream; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/SortedInputIterator.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/SortedInputIterator.java index 6a302d94d7c..854a48137a5 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/SortedInputIterator.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/SortedInputIterator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest; - /* * 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.lucene.search.suggest; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest; import java.io.IOException; import java.util.Comparator; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/UnsortedInputIterator.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/UnsortedInputIterator.java index 9b717abe623..f7d1efe6af7 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/UnsortedInputIterator.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/UnsortedInputIterator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest; - /* * 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.lucene.search.suggest; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest; import java.io.IOException; import java.util.Random; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java index 5aaabbdc888..05e75db8ec2 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.analyzing; - /* * 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.lucene.search.suggest.analyzing; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.analyzing; import java.io.Closeable; import java.io.IOException; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggester.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggester.java index f54ad03c616..2722d6b936a 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggester.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggester.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.analyzing; - /* * 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.lucene.search.suggest.analyzing; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.analyzing; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggester.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggester.java index 63d5cd003cc..925f8b0cd32 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggester.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggester.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.analyzing; - /* * 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.lucene.search.suggest.analyzing; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.analyzing; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FSTUtil.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FSTUtil.java index 11adf2d1dee..28e263b6083 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FSTUtil.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FSTUtil.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.analyzing; - /* * 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.lucene.search.suggest.analyzing; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.analyzing; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FreeTextSuggester.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FreeTextSuggester.java index 97c896eb3aa..cc4ed4b00bb 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FreeTextSuggester.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FreeTextSuggester.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.analyzing; - /* * 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.lucene.search.suggest.analyzing; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.analyzing; // TODO // - test w/ syns diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FuzzySuggester.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FuzzySuggester.java index 854245910be..6a7cfc493b0 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FuzzySuggester.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/FuzzySuggester.java @@ -1,4 +1,3 @@ -package org.apache.lucene.search.suggest.analyzing; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.lucene.search.suggest.analyzing; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.search.suggest.analyzing; import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/SuggestStopFilter.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/SuggestStopFilter.java index 71cb4b98efd..dd8e08221b7 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/SuggestStopFilter.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/SuggestStopFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.analyzing; - /* * 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.lucene.search.suggest.analyzing; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.analyzing; import java.io.IOException; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/SuggestStopFilterFactory.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/SuggestStopFilterFactory.java index 03bdc7145a6..32baf08e434 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/SuggestStopFilterFactory.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/SuggestStopFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.analyzing; - /* * 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.lucene.search.suggest.analyzing; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.analyzing; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.core.StopAnalyzer; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/package-info.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/package-info.java index 3ac2442babc..7b8c90c04b3 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/package-info.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analyzer based autosuggest. */ diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/Completion50PostingsFormat.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/Completion50PostingsFormat.java index 19e29040f86..f859262cbf7 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/Completion50PostingsFormat.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/Completion50PostingsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.document; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,7 +14,7 @@ package org.apache.lucene.search.suggest.document; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.search.suggest.document; import org.apache.lucene.codecs.PostingsFormat; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionAnalyzer.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionAnalyzer.java index 2bf41516985..6366b6c9f13 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionAnalyzer.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionAnalyzer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.document; - /* * 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.lucene.search.suggest.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.document; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.AnalyzerWrapper; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionFieldsConsumer.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionFieldsConsumer.java index c1bf486648d..672c5824463 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionFieldsConsumer.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionFieldsConsumer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.document; - /* * 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.lucene.search.suggest.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.document; import java.io.IOException; import java.util.HashMap; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionFieldsProducer.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionFieldsProducer.java index 1ef3d5f9774..7a29b616ce7 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionFieldsProducer.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionFieldsProducer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.document; - /* * 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.lucene.search.suggest.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.document; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionPostingsFormat.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionPostingsFormat.java index d2e3e9f8f51..e28106fe418 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionPostingsFormat.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionPostingsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.document; - /* * 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.lucene.search.suggest.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.document; import java.io.IOException; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionQuery.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionQuery.java index 9c8d5f0cbb4..71ba15ae120 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionQuery.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.document; - /* * 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.lucene.search.suggest.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.document; import java.io.IOException; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionScorer.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionScorer.java index 9b5c9871026..5c0601be9e9 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionScorer.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionScorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.document; - /* * 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.lucene.search.suggest.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.document; import java.io.IOException; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionTerms.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionTerms.java index 6accac4678f..0f86739515f 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionTerms.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionTerms.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.document; - /* * 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.lucene.search.suggest.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.document; import java.io.IOException; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionTokenStream.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionTokenStream.java index 2e3bc9c99ab..7308e65acc9 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionTokenStream.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionTokenStream.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.document; - /* * 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.lucene.search.suggest.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.document; import java.io.IOException; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionWeight.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionWeight.java index 95166a841ae..be18ea25474 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionWeight.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionWeight.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.document; - /* * 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.lucene.search.suggest.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.document; import java.io.IOException; import java.util.Set; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionsTermsReader.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionsTermsReader.java index 35e2d4647e5..5eeeb69b4cf 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionsTermsReader.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/CompletionsTermsReader.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.document; - /* * 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.lucene.search.suggest.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.document; import java.io.IOException; import java.util.Collection; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/ContextQuery.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/ContextQuery.java index 2dce56b2912..d004cdb109e 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/ContextQuery.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/ContextQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.document; - /* * 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.lucene.search.suggest.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.document; import java.io.IOException; import java.util.HashMap; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/ContextSuggestField.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/ContextSuggestField.java index 9296f9639bf..4cb91b8053c 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/ContextSuggestField.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/ContextSuggestField.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.document; - /* * 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.lucene.search.suggest.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.document; import java.io.IOException; import java.util.Collections; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/FuzzyCompletionQuery.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/FuzzyCompletionQuery.java index 85c5d6ecea5..2359e4ca7b7 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/FuzzyCompletionQuery.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/FuzzyCompletionQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.document; - /* * 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.lucene.search.suggest.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.document; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/NRTSuggester.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/NRTSuggester.java index db094826a47..52e4ea02816 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/NRTSuggester.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/NRTSuggester.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.document; - /* * 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.lucene.search.suggest.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.document; import java.io.IOException; import java.util.Collection; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/NRTSuggesterBuilder.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/NRTSuggesterBuilder.java index a962bbf49fc..270463175d7 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/NRTSuggesterBuilder.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/NRTSuggesterBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.document; - /* * 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.lucene.search.suggest.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.document; import java.io.IOException; import java.util.PriorityQueue; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/PrefixCompletionQuery.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/PrefixCompletionQuery.java index 49d707c5bbf..b8fc0053be1 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/PrefixCompletionQuery.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/PrefixCompletionQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.document; - /* * 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.lucene.search.suggest.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.document; import java.io.IOException; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/RegexCompletionQuery.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/RegexCompletionQuery.java index b9b5ae640b7..18a643f60f1 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/RegexCompletionQuery.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/RegexCompletionQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.document; - /* * 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.lucene.search.suggest.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.document; import java.io.IOException; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/SuggestField.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/SuggestField.java index 00a733f731f..798a0b81cbe 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/SuggestField.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/SuggestField.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.document; - /* * 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.lucene.search.suggest.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.document; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/SuggestIndexSearcher.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/SuggestIndexSearcher.java index 25566dc2a54..34076330cad 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/SuggestIndexSearcher.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/SuggestIndexSearcher.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.document; - /* * 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.lucene.search.suggest.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.document; import java.io.IOException; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/SuggestScoreDocPriorityQueue.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/SuggestScoreDocPriorityQueue.java index 634383c9f76..b395a3f784d 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/SuggestScoreDocPriorityQueue.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/SuggestScoreDocPriorityQueue.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.document; - /* * 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.lucene.search.suggest.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.document; import org.apache.lucene.search.suggest.document.TopSuggestDocs.SuggestScoreDoc; import org.apache.lucene.util.PriorityQueue; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/TopSuggestDocs.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/TopSuggestDocs.java index 049f73a7169..6154d29f18f 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/TopSuggestDocs.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/TopSuggestDocs.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.document; - /* * 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.lucene.search.suggest.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.document; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.TopDocs; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/TopSuggestDocsCollector.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/TopSuggestDocsCollector.java index 1cb327715a0..d50e93bdaa5 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/TopSuggestDocsCollector.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/TopSuggestDocsCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.document; - /* * 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.lucene.search.suggest.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.document; import java.io.IOException; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/package-info.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/package-info.java index 33025644102..063f6c453e3 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/package-info.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Support for document suggestion */ diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/BytesRefSorter.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/BytesRefSorter.java index af0d8c240a5..92b669890d8 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/BytesRefSorter.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/BytesRefSorter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.fst; - /* * 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.lucene.search.suggest.fst; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.fst; import java.io.IOException; import java.util.Comparator; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/ExternalRefSorter.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/ExternalRefSorter.java index e07a68c4d3e..e5cb34122f1 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/ExternalRefSorter.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/ExternalRefSorter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.fst; - /* * 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.lucene.search.suggest.fst; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.fst; import java.io.Closeable; import java.io.IOException; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTCompletion.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTCompletion.java index 51b8c18cbc5..4a877d6e960 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTCompletion.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTCompletion.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.fst; - /* * 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.lucene.search.suggest.fst; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.fst; import java.io.IOException; import java.util.*; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTCompletionBuilder.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTCompletionBuilder.java index 9a57b72cd9c..28670affbb4 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTCompletionBuilder.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTCompletionBuilder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.fst; - /* * 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.lucene.search.suggest.fst; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.fst; import java.io.Closeable; import java.io.IOException; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTCompletionLookup.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTCompletionLookup.java index 24dd0f9e2df..ea8e52f5b6b 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTCompletionLookup.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/FSTCompletionLookup.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.fst; - /* * 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.lucene.search.suggest.fst; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.fst; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/WFSTCompletionLookup.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/WFSTCompletionLookup.java index cc036499e57..1cc89a4d076 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/WFSTCompletionLookup.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/WFSTCompletionLookup.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.fst; - /* * 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.lucene.search.suggest.fst; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.fst; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/package-info.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/package-info.java index 24b0b4e63f4..0d7c9b6225b 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/package-info.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Finite-state based autosuggest. */ diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellLookup.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellLookup.java index 6182fa42329..d50100bda53 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellLookup.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellLookup.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.jaspell; - /* * 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.lucene.search.suggest.jaspell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.jaspell; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java index 58328168db6..29a99aa2cce 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.jaspell; - /** * Copyright (c) 2005 Bruno Martins * All rights reserved. @@ -28,6 +26,7 @@ package org.apache.lucene.search.suggest.jaspell; * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. */ +package org.apache.lucene.search.suggest.jaspell; import java.io.BufferedReader; import java.io.IOException; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/package-info.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/package-info.java index bd074afcc10..6ea7b7a36f5 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/package-info.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * JaSpell-based autosuggest. */ diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/package-info.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/package-info.java index a80b317201c..bad2d9a8a54 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/package-info.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Support for Autocomplete/Autosuggest */ diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/tst/TSTAutocomplete.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/tst/TSTAutocomplete.java index ae454b7ddd2..4af7aef4c81 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/tst/TSTAutocomplete.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/tst/TSTAutocomplete.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.tst; - /* * 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.lucene.search.suggest.tst; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.tst; import java.util.*; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/tst/TSTLookup.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/tst/TSTLookup.java index 77c16e91f22..1196917a2e3 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/tst/TSTLookup.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/tst/TSTLookup.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.tst; - /* * 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.lucene.search.suggest.tst; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.tst; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/tst/TernaryTreeNode.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/tst/TernaryTreeNode.java index 922db550406..26416b14919 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/tst/TernaryTreeNode.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/tst/TernaryTreeNode.java @@ -1,7 +1,3 @@ -package org.apache.lucene.search.suggest.tst; - -import org.apache.lucene.util.RamUsageEstimator; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import org.apache.lucene.util.RamUsageEstimator; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.tst; + +import org.apache.lucene.util.RamUsageEstimator; /** * The class creates a TST node. diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/tst/package-info.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/tst/package-info.java index b136dce7caf..2fe7d38251d 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/tst/package-info.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/tst/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Ternary Search Tree based autosuggest. */ diff --git a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestDirectSpellChecker.java b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestDirectSpellChecker.java index cdbf9eabad6..c1d79564a7a 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestDirectSpellChecker.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestDirectSpellChecker.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spell; - /* * 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.lucene.search.spell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spell; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.MockAnalyzer; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestJaroWinklerDistance.java b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestJaroWinklerDistance.java index b980d4d38cd..4e04b98c8c5 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestJaroWinklerDistance.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestJaroWinklerDistance.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spell; - /* * 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.lucene.search.spell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spell; import org.apache.lucene.util.LuceneTestCase; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestLevenshteinDistance.java b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestLevenshteinDistance.java index 9343b1fc36b..8b2cfd91d52 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestLevenshteinDistance.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestLevenshteinDistance.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spell; - /* * 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.lucene.search.spell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spell; import org.apache.lucene.util.LuceneTestCase; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java index 4dbbf4096b1..902bec8245f 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestLuceneDictionary.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spell; - /* * 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.lucene.search.spell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spell; import java.io.IOException; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestNGramDistance.java b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestNGramDistance.java index e70ca9fe817..63ff48bf9cb 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestNGramDistance.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestNGramDistance.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spell; - /* * 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.lucene.search.spell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spell; import org.apache.lucene.util.LuceneTestCase; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestPlainTextDictionary.java b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestPlainTextDictionary.java index 55ec0d6ad68..abf2cab9d17 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestPlainTextDictionary.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestPlainTextDictionary.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spell; - /* * 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.lucene.search.spell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spell; import java.io.IOException; import java.io.StringReader; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestSpellChecker.java b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestSpellChecker.java index 823fade92e3..02484ad50c5 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestSpellChecker.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestSpellChecker.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spell; - /* * 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.lucene.search.spell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spell; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestWordBreakSpellChecker.java b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestWordBreakSpellChecker.java index 4cfb515b398..35e8245ac8b 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/spell/TestWordBreakSpellChecker.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/spell/TestWordBreakSpellChecker.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spell; - /* * 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.lucene.search.spell; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spell; import java.util.ArrayList; import java.util.List; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/Average.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/Average.java index 5f47325a990..6a79d90ce1e 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/Average.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/Average.java @@ -1,6 +1,3 @@ -package org.apache.lucene.search.suggest; - - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +14,8 @@ package org.apache.lucene.search.suggest; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest; + import java.util.List; import java.util.Locale; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/DocumentDictionaryTest.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/DocumentDictionaryTest.java index 0a89d2cf890..a7e9b002c5c 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/DocumentDictionaryTest.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/DocumentDictionaryTest.java @@ -1,3 +1,19 @@ +/* + * 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.suggest; import java.io.IOException; @@ -31,23 +47,6 @@ import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.LuceneTestCase; import org.junit.Test; -/* - * 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 DocumentDictionaryTest extends LuceneTestCase { static final String FIELD_NAME = "f1"; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/DocumentValueSourceDictionaryTest.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/DocumentValueSourceDictionaryTest.java index cfa1fc32cd0..9e58a4e4ea3 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/DocumentValueSourceDictionaryTest.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/DocumentValueSourceDictionaryTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest; - /* * 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.lucene.search.suggest; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/FileDictionaryTest.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/FileDictionaryTest.java index 29f7387fca7..6d32570d400 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/FileDictionaryTest.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/FileDictionaryTest.java @@ -1,3 +1,19 @@ +/* + * 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.suggest; import java.io.ByteArrayInputStream; @@ -16,23 +32,6 @@ import org.apache.lucene.util.TestUtil; import org.junit.Test; -/* - * 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 FileDictionaryTest extends LuceneTestCase { private Map.Entry, String> generateFileEntry(String fieldDelimiter, boolean hasWeight, boolean hasPayload) { diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/Input.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/Input.java index 2ea44bdef04..5cb07902e0b 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/Input.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/Input.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest; - /* * 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.lucene.search.suggest; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest; import java.util.Set; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/InputArrayIterator.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/InputArrayIterator.java index cdd96d69334..a62e887ccbe 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/InputArrayIterator.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/InputArrayIterator.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest; - /* * 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.lucene.search.suggest; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest; import java.util.Arrays; import java.util.Iterator; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/LookupBenchmarkTest.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/LookupBenchmarkTest.java index a0b327849c5..12c641645e6 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/LookupBenchmarkTest.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/LookupBenchmarkTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest; - /* * 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.lucene.search.suggest; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest; import java.io.BufferedReader; import java.io.InputStreamReader; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestHighFrequencyDictionary.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestHighFrequencyDictionary.java index 122443eed67..c76c1a64bce 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestHighFrequencyDictionary.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestHighFrequencyDictionary.java @@ -1,21 +1,20 @@ -package org.apache.lucene.search.suggest; - /* * 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 - * + * 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. + * 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.suggest; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.index.DirectoryReader; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestInputIterator.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestInputIterator.java index 55e70bd9a10..f833bed82a4 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestInputIterator.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/TestInputIterator.java @@ -1,21 +1,20 @@ -package org.apache.lucene.search.suggest; - /* * 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 - * + * 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. + * 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.suggest; import java.util.AbstractMap.SimpleEntry; import java.util.Comparator; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.java index b51894d1b8c..092eb959d62 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.analyzing; - /* * 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.lucene.search.suggest.analyzing; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.analyzing; import java.io.IOException; import java.io.StringReader; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggesterTest.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggesterTest.java index a9c7acc115e..4621faeaaf7 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggesterTest.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggesterTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.analyzing; - /* * 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.lucene.search.suggest.analyzing; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.analyzing; import java.io.IOException; import java.io.InputStream; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggesterTest.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggesterTest.java index 614a1a2c4fa..c2b2bed803c 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggesterTest.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggesterTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.analyzing; - /* * 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.lucene.search.suggest.analyzing; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.analyzing; import java.io.IOException; import java.nio.file.Path; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/FuzzySuggesterTest.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/FuzzySuggesterTest.java index 47c19e1b995..10231d5d3c2 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/FuzzySuggesterTest.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/FuzzySuggesterTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.analyzing; - /* * 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.lucene.search.suggest.analyzing; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.analyzing; import java.io.IOException; import java.io.Reader; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestFreeTextSuggester.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestFreeTextSuggester.java index 4d678c303d2..45a68551583 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestFreeTextSuggester.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestFreeTextSuggester.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.analyzing; - /* * 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.lucene.search.suggest.analyzing; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.analyzing; import java.io.IOException; import java.io.InputStream; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestSuggestStopFilter.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestSuggestStopFilter.java index e42342a1ee8..44917d2658c 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestSuggestStopFilter.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestSuggestStopFilter.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.analyzing; - /* * 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.lucene.search.suggest.analyzing; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.analyzing; import java.io.StringReader; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestSuggestStopFilterFactory.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestSuggestStopFilterFactory.java index 7b0b6615f44..b901c21edc3 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestSuggestStopFilterFactory.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/TestSuggestStopFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.analyzing; - /* * 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.lucene.search.suggest.analyzing; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.analyzing; import java.io.IOException; import java.util.HashMap; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/CompletionTokenStreamTest.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/CompletionTokenStreamTest.java index 2b751df0e07..6f558d1985d 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/CompletionTokenStreamTest.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/CompletionTokenStreamTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.document; - /* * 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.lucene.search.suggest.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.document; import java.io.IOException; import java.io.StringReader; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestContextQuery.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestContextQuery.java index 20a76e635bf..1be3f37d6cb 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestContextQuery.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestContextQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.document; - /* * 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.lucene.search.suggest.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.document; import java.util.ArrayList; import java.util.Arrays; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestContextSuggestField.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestContextSuggestField.java index 00081cf9e6b..4f236798082 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestContextSuggestField.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestContextSuggestField.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.document; - /* * 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.lucene.search.suggest.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.document; import java.io.ByteArrayOutputStream; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestFuzzyCompletionQuery.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestFuzzyCompletionQuery.java index 283f5c147c0..9a773ca4c74 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestFuzzyCompletionQuery.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestFuzzyCompletionQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.document; - /* * 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.lucene.search.suggest.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.document; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.MockAnalyzer; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestPrefixCompletionQuery.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestPrefixCompletionQuery.java index 20a2df1b7ad..777c0c8ccc7 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestPrefixCompletionQuery.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestPrefixCompletionQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.document; - /* * 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.lucene.search.suggest.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.document; import java.io.IOException; import java.util.Objects; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestRegexCompletionQuery.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestRegexCompletionQuery.java index 1ae1e216246..23710e90ab6 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestRegexCompletionQuery.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestRegexCompletionQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.document; - /* * 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.lucene.search.suggest.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.document; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.MockAnalyzer; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestSuggestField.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestSuggestField.java index 92271f3db08..1e2b946f93f 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestSuggestField.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/document/TestSuggestField.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.document; - /* * 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.lucene.search.suggest.document; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.document; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/BytesRefSortersTest.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/BytesRefSortersTest.java index ce332ce4e39..f765055904b 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/BytesRefSortersTest.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/BytesRefSortersTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.fst; - /* * 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.lucene.search.suggest.fst; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.fst; import org.apache.lucene.search.suggest.InMemorySorter; import org.apache.lucene.store.Directory; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/FSTCompletionTest.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/FSTCompletionTest.java index bddb3066545..980130a588d 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/FSTCompletionTest.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/FSTCompletionTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.fst; - /* * 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.lucene.search.suggest.fst; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.fst; import java.nio.charset.StandardCharsets; import java.util.*; diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/WFSTCompletionTest.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/WFSTCompletionTest.java index c213c4be23a..40b43f97479 100644 --- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/WFSTCompletionTest.java +++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/WFSTCompletionTest.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.suggest.fst; - /* * 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.lucene.search.suggest.fst; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.suggest.fst; import java.util.*; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java index 183b900446a..c57a8bca6d1 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.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 @@ -16,6 +14,7 @@ package org.apache.lucene.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis; import java.io.IOException; import java.io.PrintWriter; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/CannedBinaryTokenStream.java b/lucene/test-framework/src/java/org/apache/lucene/analysis/CannedBinaryTokenStream.java index d11cc35e35e..b0096bc6536 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/CannedBinaryTokenStream.java +++ b/lucene/test-framework/src/java/org/apache/lucene/analysis/CannedBinaryTokenStream.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 @@ -16,6 +14,7 @@ package org.apache.lucene.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis; import org.apache.lucene.analysis.tokenattributes.BytesTermAttribute; import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/CannedTokenStream.java b/lucene/test-framework/src/java/org/apache/lucene/analysis/CannedTokenStream.java index 90aa66229b5..82507997056 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/CannedTokenStream.java +++ b/lucene/test-framework/src/java/org/apache/lucene/analysis/CannedTokenStream.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 @@ -16,6 +14,7 @@ package org.apache.lucene.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis; import java.io.IOException; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/CollationTestBase.java b/lucene/test-framework/src/java/org/apache/lucene/analysis/CollationTestBase.java index 23d082231df..7e8682e618f 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/CollationTestBase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/analysis/CollationTestBase.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 @@ -16,7 +14,7 @@ package org.apache.lucene.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.analysis; import java.io.IOException; import java.util.HashMap; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/CrankyTokenFilter.java b/lucene/test-framework/src/java/org/apache/lucene/analysis/CrankyTokenFilter.java index 9515aea2c4b..9c29d3fc7b1 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/CrankyTokenFilter.java +++ b/lucene/test-framework/src/java/org/apache/lucene/analysis/CrankyTokenFilter.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 @@ -16,6 +14,7 @@ package org.apache.lucene.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis; import java.io.IOException; import java.util.Random; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/LookaheadTokenFilter.java b/lucene/test-framework/src/java/org/apache/lucene/analysis/LookaheadTokenFilter.java index e664026a852..b0ab6edb316 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/LookaheadTokenFilter.java +++ b/lucene/test-framework/src/java/org/apache/lucene/analysis/LookaheadTokenFilter.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 @@ -16,6 +14,7 @@ package org.apache.lucene.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockAnalyzer.java b/lucene/test-framework/src/java/org/apache/lucene/analysis/MockAnalyzer.java index 7b75b1f58b6..bd9c5e8e336 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockAnalyzer.java +++ b/lucene/test-framework/src/java/org/apache/lucene/analysis/MockAnalyzer.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 @@ -16,6 +14,7 @@ package org.apache.lucene.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis; import java.io.Reader; import java.util.HashMap; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockBytesAnalyzer.java b/lucene/test-framework/src/java/org/apache/lucene/analysis/MockBytesAnalyzer.java index 02a05f28f6c..01f3d4d1092 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockBytesAnalyzer.java +++ b/lucene/test-framework/src/java/org/apache/lucene/analysis/MockBytesAnalyzer.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 @@ -16,6 +14,7 @@ package org.apache.lucene.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis; /** * Analyzer for testing that encodes terms as UTF-16 bytes. diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockCharFilter.java b/lucene/test-framework/src/java/org/apache/lucene/analysis/MockCharFilter.java index 5e88a60ef40..01e89700b5d 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockCharFilter.java +++ b/lucene/test-framework/src/java/org/apache/lucene/analysis/MockCharFilter.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 @@ -16,6 +14,7 @@ package org.apache.lucene.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis; import java.io.IOException; import java.io.Reader; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockFixedLengthPayloadFilter.java b/lucene/test-framework/src/java/org/apache/lucene/analysis/MockFixedLengthPayloadFilter.java index fef74f06383..4a92a9ea763 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockFixedLengthPayloadFilter.java +++ b/lucene/test-framework/src/java/org/apache/lucene/analysis/MockFixedLengthPayloadFilter.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 @@ -16,6 +14,7 @@ package org.apache.lucene.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis; import java.io.IOException; import java.util.Random; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockGraphTokenFilter.java b/lucene/test-framework/src/java/org/apache/lucene/analysis/MockGraphTokenFilter.java index 4dbb7b02f6f..2dca7832657 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockGraphTokenFilter.java +++ b/lucene/test-framework/src/java/org/apache/lucene/analysis/MockGraphTokenFilter.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 @@ -16,6 +14,7 @@ package org.apache.lucene.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis; import java.io.IOException; import java.util.Random; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockHoleInjectingTokenFilter.java b/lucene/test-framework/src/java/org/apache/lucene/analysis/MockHoleInjectingTokenFilter.java index 8d3ad2b55b6..e60f07a0b44 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockHoleInjectingTokenFilter.java +++ b/lucene/test-framework/src/java/org/apache/lucene/analysis/MockHoleInjectingTokenFilter.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 @@ -16,7 +14,7 @@ package org.apache.lucene.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.analysis; import java.io.IOException; import java.util.Random; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockPayloadAnalyzer.java b/lucene/test-framework/src/java/org/apache/lucene/analysis/MockPayloadAnalyzer.java index 09393ef6d69..a1e8bceaac1 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockPayloadAnalyzer.java +++ b/lucene/test-framework/src/java/org/apache/lucene/analysis/MockPayloadAnalyzer.java @@ -1,4 +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 @@ -15,8 +14,7 @@ package org.apache.lucene.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ - - +package org.apache.lucene.analysis; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.PayloadAttribute; import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockRandomLookaheadTokenFilter.java b/lucene/test-framework/src/java/org/apache/lucene/analysis/MockRandomLookaheadTokenFilter.java index 1c0c061cfe2..d2ff90859e6 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockRandomLookaheadTokenFilter.java +++ b/lucene/test-framework/src/java/org/apache/lucene/analysis/MockRandomLookaheadTokenFilter.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 @@ -16,6 +14,7 @@ package org.apache.lucene.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis; import java.io.IOException; import java.util.Random; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockReaderWrapper.java b/lucene/test-framework/src/java/org/apache/lucene/analysis/MockReaderWrapper.java index 742059edcc0..7057a647095 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockReaderWrapper.java +++ b/lucene/test-framework/src/java/org/apache/lucene/analysis/MockReaderWrapper.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 @@ -16,6 +14,7 @@ package org.apache.lucene.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis; import java.io.IOException; import java.io.Reader; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockTokenFilter.java b/lucene/test-framework/src/java/org/apache/lucene/analysis/MockTokenFilter.java index 25619a8c770..331f88c62ec 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockTokenFilter.java +++ b/lucene/test-framework/src/java/org/apache/lucene/analysis/MockTokenFilter.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 @@ -16,6 +14,7 @@ package org.apache.lucene.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis; import static org.apache.lucene.util.automaton.Automata.makeEmpty; import static org.apache.lucene.util.automaton.Automata.makeString; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockTokenizer.java b/lucene/test-framework/src/java/org/apache/lucene/analysis/MockTokenizer.java index 22bf6b8d632..c185b76b39c 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockTokenizer.java +++ b/lucene/test-framework/src/java/org/apache/lucene/analysis/MockTokenizer.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 @@ -16,6 +14,7 @@ package org.apache.lucene.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis; import java.io.IOException; import java.nio.CharBuffer; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockUTF16TermAttributeImpl.java b/lucene/test-framework/src/java/org/apache/lucene/analysis/MockUTF16TermAttributeImpl.java index aa5dbac01c0..e65f15185e5 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockUTF16TermAttributeImpl.java +++ b/lucene/test-framework/src/java/org/apache/lucene/analysis/MockUTF16TermAttributeImpl.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 @@ -16,6 +14,7 @@ package org.apache.lucene.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis; import java.nio.charset.StandardCharsets; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockVariableLengthPayloadFilter.java b/lucene/test-framework/src/java/org/apache/lucene/analysis/MockVariableLengthPayloadFilter.java index 88403fa7bf0..a70cef3e108 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockVariableLengthPayloadFilter.java +++ b/lucene/test-framework/src/java/org/apache/lucene/analysis/MockVariableLengthPayloadFilter.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 @@ -16,6 +14,7 @@ package org.apache.lucene.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis; import java.io.IOException; import java.util.Random; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/SimplePayloadFilter.java b/lucene/test-framework/src/java/org/apache/lucene/analysis/SimplePayloadFilter.java index 9bf1b3c58aa..954fd16a2a4 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/SimplePayloadFilter.java +++ b/lucene/test-framework/src/java/org/apache/lucene/analysis/SimplePayloadFilter.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 @@ -16,6 +14,7 @@ package org.apache.lucene.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis; import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/TokenStreamToDot.java b/lucene/test-framework/src/java/org/apache/lucene/analysis/TokenStreamToDot.java index 0749098ac78..4e8eeb8b202 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/TokenStreamToDot.java +++ b/lucene/test-framework/src/java/org/apache/lucene/analysis/TokenStreamToDot.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 @@ -16,6 +14,7 @@ package org.apache.lucene.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis; import java.io.PrintWriter; import java.io.IOException; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/ValidatingTokenFilter.java b/lucene/test-framework/src/java/org/apache/lucene/analysis/ValidatingTokenFilter.java index 6c7c725e9f7..b31b604fb75 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/ValidatingTokenFilter.java +++ b/lucene/test-framework/src/java/org/apache/lucene/analysis/ValidatingTokenFilter.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 @@ -16,6 +14,7 @@ package org.apache.lucene.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis; import java.io.IOException; import java.util.HashMap; diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/VocabularyAssert.java b/lucene/test-framework/src/java/org/apache/lucene/analysis/VocabularyAssert.java index de77e96326d..8e430d2a1a5 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/VocabularyAssert.java +++ b/lucene/test-framework/src/java/org/apache/lucene/analysis/VocabularyAssert.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 @@ -16,6 +14,7 @@ package org.apache.lucene.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis; import java.io.BufferedReader; import java.io.IOException; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/MissingOrdRemapper.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/MissingOrdRemapper.java index 770cfbda68c..cb2d7dcfcf7 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/MissingOrdRemapper.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/MissingOrdRemapper.java @@ -1,9 +1,3 @@ -package org.apache.lucene.codecs; - -import java.util.Iterator; - -import org.apache.lucene.util.BytesRef; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -20,6 +14,11 @@ import org.apache.lucene.util.BytesRef; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs; + +import java.util.Iterator; + +import org.apache.lucene.util.BytesRef; /** * a utility class to write missing values for SORTED as if they were the empty string diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingCodec.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingCodec.java index 1e32e012868..9e063072717 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingCodec.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingCodec.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.asserting; - /* * 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.lucene.codecs.asserting; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.asserting; import org.apache.lucene.codecs.PointFormat; import org.apache.lucene.codecs.DocValuesFormat; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingDocValuesFormat.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingDocValuesFormat.java index ad71531b4a9..e0af9a1d74f 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingDocValuesFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingDocValuesFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.asserting; - /* * 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.lucene.codecs.asserting; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.asserting; import java.io.IOException; import java.util.Collection; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingLiveDocsFormat.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingLiveDocsFormat.java index fe8fa1d40ff..4837513f50f 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingLiveDocsFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingLiveDocsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.asserting; - /* * 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.lucene.codecs.asserting; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.asserting; import java.io.IOException; import java.util.Collection; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingNormsFormat.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingNormsFormat.java index add7fb08ee8..e646eb5931f 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingNormsFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingNormsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.asserting; - /* * 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.lucene.codecs.asserting; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.asserting; import java.io.IOException; import java.util.Collection; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPointFormat.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPointFormat.java index 173e257cbd6..e2d1b07a551 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPointFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPointFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.asserting; - /* * 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.lucene.codecs.asserting; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.asserting; import java.io.IOException; import java.util.Collection; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java index 03fd23a57ea..a89b5081ded 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.asserting; - /* * 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.lucene.codecs.asserting; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.asserting; import java.io.IOException; import java.util.Collection; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingStoredFieldsFormat.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingStoredFieldsFormat.java index 4888fe06cad..e2688a172d5 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingStoredFieldsFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingStoredFieldsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.asserting; - /* * 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.lucene.codecs.asserting; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.asserting; import java.io.IOException; import java.util.Collection; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingTermVectorsFormat.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingTermVectorsFormat.java index dcab32c6350..000fd6f3ff8 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingTermVectorsFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingTermVectorsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.asserting; - /* * 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.lucene.codecs.asserting; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.asserting; import java.io.IOException; import java.util.Collection; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/package-info.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/package-info.java index bccdd5d4bf6..5429818eeb9 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/package-info.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Codec for testing that asserts various contracts of the codec apis. */ diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneFixedGap.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneFixedGap.java index c77ba23ff85..1cb852b44b7 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneFixedGap.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneFixedGap.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.blockterms; - /* * 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.lucene.codecs.blockterms; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.blockterms; import java.io.IOException; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneVarGapDocFreqInterval.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneVarGapDocFreqInterval.java index a2675262a41..12cd2746454 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneVarGapDocFreqInterval.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneVarGapDocFreqInterval.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.blockterms; - /* * 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.lucene.codecs.blockterms; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.blockterms; import java.io.IOException; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneVarGapFixedInterval.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneVarGapFixedInterval.java index d664fa9474f..c7f2309b559 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneVarGapFixedInterval.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/blockterms/LuceneVarGapFixedInterval.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.blockterms; - /* * 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.lucene.codecs.blockterms; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.blockterms; import java.io.IOException; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/bloom/TestBloomFilteredLucenePostings.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/bloom/TestBloomFilteredLucenePostings.java index f85a1906a7e..7c38d4cf330 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/bloom/TestBloomFilteredLucenePostings.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/bloom/TestBloomFilteredLucenePostings.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.bloom; - /* * 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.lucene.codecs.bloom; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.bloom; import java.io.IOException; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/cheapbastard/CheapBastardCodec.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/cheapbastard/CheapBastardCodec.java index fdc186f084c..f34aa826797 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/cheapbastard/CheapBastardCodec.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/cheapbastard/CheapBastardCodec.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.cheapbastard; - /* * 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.lucene.codecs.cheapbastard; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.cheapbastard; import org.apache.lucene.codecs.FilterCodec; import org.apache.lucene.codecs.PostingsFormat; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/cheapbastard/package-info.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/cheapbastard/package-info.java index f9d245ef58b..e559eabbadf 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/cheapbastard/package-info.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/cheapbastard/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Codec that unreasonably tries to use as little RAM as possible. * For testing, benchmarking, API purposes only! diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/CompressingCodec.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/CompressingCodec.java index d4ea1b4c66e..7db02337540 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/CompressingCodec.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/CompressingCodec.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.compressing; - /* * 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.lucene.codecs.compressing; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.compressing; import java.util.Random; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/FastCompressingCodec.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/FastCompressingCodec.java index 295e645a29e..007948c7dff 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/FastCompressingCodec.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/FastCompressingCodec.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.compressing; - /* * 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.lucene.codecs.compressing; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.compressing; /** CompressionCodec that uses {@link CompressionMode#FAST} */ public class FastCompressingCodec extends CompressingCodec { diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/FastDecompressionCompressingCodec.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/FastDecompressionCompressingCodec.java index 2ba2848aa44..d569b168268 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/FastDecompressionCompressingCodec.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/FastDecompressionCompressingCodec.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.compressing; - /* * 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.lucene.codecs.compressing; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.compressing; /** CompressionCodec that uses {@link CompressionMode#FAST_DECOMPRESSION} */ public class FastDecompressionCompressingCodec extends CompressingCodec { diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/HighCompressionCompressingCodec.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/HighCompressionCompressingCodec.java index 5894d2a57b1..85b4f0d5b70 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/HighCompressionCompressingCodec.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/HighCompressionCompressingCodec.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.compressing; - /* * 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.lucene.codecs.compressing; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.compressing; /** CompressionCodec that uses {@link CompressionMode#HIGH_COMPRESSION} */ public class HighCompressionCompressingCodec extends CompressingCodec { diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/dummy/DummyCompressingCodec.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/dummy/DummyCompressingCodec.java index 1476de55a5a..d15adadd4f7 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/dummy/DummyCompressingCodec.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/dummy/DummyCompressingCodec.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.compressing.dummy; - /* * 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.lucene.codecs.compressing.dummy; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.compressing.dummy; import java.io.IOException; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/dummy/package-info.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/dummy/package-info.java index f8fcbdfd55e..cf831c08318 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/dummy/package-info.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/dummy/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Dummy CompressingCodec implementation used for testing. */ diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyCodec.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyCodec.java index 3367d429093..314ff95031f 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyCodec.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyCodec.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.cranky; - /* * 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.lucene.codecs.cranky; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.cranky; import java.util.Random; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyCompoundFormat.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyCompoundFormat.java index 221a1896445..1b6b7f6ba71 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyCompoundFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyCompoundFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.cranky; - /* * 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.lucene.codecs.cranky; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.cranky; import java.io.IOException; import java.util.Random; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyDocValuesFormat.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyDocValuesFormat.java index 0ee8281c639..f29a3f92a38 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyDocValuesFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyDocValuesFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.cranky; - /* * 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.lucene.codecs.cranky; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.cranky; import java.io.IOException; import java.util.Random; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyFieldInfosFormat.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyFieldInfosFormat.java index be51cb5127b..4c5ab598056 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyFieldInfosFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyFieldInfosFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.cranky; - /* * 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.lucene.codecs.cranky; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.cranky; import java.io.IOException; import java.util.Random; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyLiveDocsFormat.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyLiveDocsFormat.java index 2909d1e1373..e8795248f8f 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyLiveDocsFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyLiveDocsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.cranky; - /* * 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.lucene.codecs.cranky; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.cranky; import java.io.IOException; import java.util.Collection; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyNormsFormat.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyNormsFormat.java index ec5e02ad66c..34b606aa7cc 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyNormsFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyNormsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.cranky; - /* * 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.lucene.codecs.cranky; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.cranky; import java.io.IOException; import java.util.Random; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyPointFormat.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyPointFormat.java index ed2b7a3da91..6b83b1e4fef 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyPointFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyPointFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.cranky; - /* * 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.lucene.codecs.cranky; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.cranky; import java.io.IOException; import java.util.Random; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyPostingsFormat.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyPostingsFormat.java index 3d19c373aee..2ca1bc75eea 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyPostingsFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyPostingsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.cranky; - /* * 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.lucene.codecs.cranky; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.cranky; import java.io.IOException; import java.util.Random; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankySegmentInfoFormat.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankySegmentInfoFormat.java index c12f65113a4..971ae02ce9b 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankySegmentInfoFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankySegmentInfoFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.cranky; - /* * 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.lucene.codecs.cranky; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.cranky; import java.io.IOException; import java.util.Random; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyStoredFieldsFormat.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyStoredFieldsFormat.java index 0a73f2e0713..650493190c8 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyStoredFieldsFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyStoredFieldsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.cranky; - /* * 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.lucene.codecs.cranky; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.cranky; import java.io.IOException; import java.util.Random; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyTermVectorsFormat.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyTermVectorsFormat.java index f0388f1f6a9..0537f25b5e2 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyTermVectorsFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyTermVectorsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.cranky; - /* * 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.lucene.codecs.cranky; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.cranky; import java.io.IOException; import java.util.Random; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/package-info.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/package-info.java index 676beacc4d3..cd6c6228aed 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/package-info.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Codec for testing that throws random IOExceptions */ diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/mockrandom/MockRandomPostingsFormat.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/mockrandom/MockRandomPostingsFormat.java index 3f38507b9f2..4d943e6a495 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/mockrandom/MockRandomPostingsFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/mockrandom/MockRandomPostingsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.mockrandom; - /* * 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.lucene.codecs.mockrandom; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.mockrandom; import java.io.IOException; import java.util.Random; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/mockrandom/package-info.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/mockrandom/package-info.java index 8a755e46273..8635f1681c9 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/mockrandom/package-info.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/mockrandom/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Frankenstein codec for testing that pieces together random components. */ diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java index 3e6d191a6df..4b85f130c4a 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.ramonly; - /* * 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.lucene.codecs.ramonly; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.ramonly; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/package-info.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/package-info.java index 8ea282fa3a6..fbfd2f0e715 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/package-info.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Codec for testing that never writes to disk. */ diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/AlcoholicMergePolicy.java b/lucene/test-framework/src/java/org/apache/lucene/index/AlcoholicMergePolicy.java index 0f21e1a22b2..f36fa265bad 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/AlcoholicMergePolicy.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/AlcoholicMergePolicy.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 @@ -16,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import java.io.IOException; import java.util.Calendar; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/AllDeletedFilterReader.java b/lucene/test-framework/src/java/org/apache/lucene/index/AllDeletedFilterReader.java index 940443343cd..ff789a06f6f 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/AllDeletedFilterReader.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/AllDeletedFilterReader.java @@ -1,7 +1,3 @@ -package org.apache.lucene.index; - -import org.apache.lucene.util.Bits; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import org.apache.lucene.util.Bits; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + +import org.apache.lucene.util.Bits; /** * Filters the incoming reader and makes all documents appear deleted. diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/AssertingDirectoryReader.java b/lucene/test-framework/src/java/org/apache/lucene/index/AssertingDirectoryReader.java index 362511e814f..712f36da9f7 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/AssertingDirectoryReader.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/AssertingDirectoryReader.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 @@ -16,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import java.io.IOException; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/AssertingLeafReader.java b/lucene/test-framework/src/java/org/apache/lucene/index/AssertingLeafReader.java index bd8141ad97a..b4bcb1ea9c8 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/AssertingLeafReader.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/AssertingLeafReader.java @@ -1,14 +1,3 @@ -package org.apache.lucene.index; - -import java.io.IOException; -import java.util.Iterator; - -import org.apache.lucene.search.DocIdSetIterator; -import org.apache.lucene.util.Bits; -import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.VirtualMethod; -import org.apache.lucene.util.automaton.CompiledAutomaton; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -25,6 +14,16 @@ import org.apache.lucene.util.automaton.CompiledAutomaton; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + +import java.io.IOException; +import java.util.Iterator; + +import org.apache.lucene.search.DocIdSetIterator; +import org.apache.lucene.util.Bits; +import org.apache.lucene.util.BytesRef; +import org.apache.lucene.util.VirtualMethod; +import org.apache.lucene.util.automaton.CompiledAutomaton; /** * A {@link FilterLeafReader} that can be used to apply diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseCompoundFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BaseCompoundFormatTestCase.java index 9122e993dab..62cb2861836 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseCompoundFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BaseCompoundFormatTestCase.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 @@ -16,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseCompressingDocValuesFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BaseCompressingDocValuesFormatTestCase.java index 44f959cd5de..585cea77ace 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseCompressingDocValuesFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BaseCompressingDocValuesFormatTestCase.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 @@ -16,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseDocValuesFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BaseDocValuesFormatTestCase.java index 135079f2bd8..79cfa0fbcb8 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseDocValuesFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BaseDocValuesFormatTestCase.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 @@ -16,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseFieldInfoFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BaseFieldInfoFormatTestCase.java index 7970435b5db..d81f18894c5 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseFieldInfoFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BaseFieldInfoFormatTestCase.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 @@ -16,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import java.io.IOException; import java.util.Collections; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java index c53293ccd65..32800fc9dbf 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.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 @@ -16,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseMergePolicyTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BaseMergePolicyTestCase.java index d94c1c31a36..81cf98a17ab 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseMergePolicyTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BaseMergePolicyTestCase.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 @@ -16,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseNormsFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BaseNormsFormatTestCase.java index f2676bb2e74..b6207beb0c8 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseNormsFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BaseNormsFormatTestCase.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 @@ -16,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BasePointFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BasePointFormatTestCase.java index 2b88d7460f6..3a8fb388881 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BasePointFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BasePointFormatTestCase.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 @@ -16,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import java.io.IOException; import java.math.BigInteger; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java index e6dd26e4e30..ab4bbf616aa 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.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 @@ -16,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import static org.apache.lucene.index.PostingsEnum.ALL; import static org.apache.lucene.index.PostingsEnum.FREQS; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseSegmentInfoFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BaseSegmentInfoFormatTestCase.java index d4a9ee27fb9..3a4ebf7db03 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseSegmentInfoFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BaseSegmentInfoFormatTestCase.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 @@ -16,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import java.io.IOException; import java.util.Collections; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java index 61b373eb453..840fdf5987e 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.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 @@ -16,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseTermVectorsFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BaseTermVectorsFormatTestCase.java index e0d036c1b51..77a46dd80db 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseTermVectorsFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BaseTermVectorsFormatTestCase.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 @@ -16,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import static org.apache.lucene.index.PostingsEnum.ALL; import static org.apache.lucene.index.PostingsEnum.FREQS; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BaseTestCheckIndex.java b/lucene/test-framework/src/java/org/apache/lucene/index/BaseTestCheckIndex.java index a6efb88364e..f39645785e8 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BaseTestCheckIndex.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BaseTestCheckIndex.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 @@ -16,7 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.lucene.index; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/DocHelper.java b/lucene/test-framework/src/java/org/apache/lucene/index/DocHelper.java index 5a06edee9df..240f4454a67 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/DocHelper.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/DocHelper.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 @@ -16,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import java.io.IOException; import java.io.UnsupportedEncodingException; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterLeafReader.java b/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterLeafReader.java index 568986e8d5f..2053199cb6c 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterLeafReader.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterLeafReader.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 @@ -16,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/ForceMergePolicy.java b/lucene/test-framework/src/java/org/apache/lucene/index/ForceMergePolicy.java index ba5b93736b0..79788f58a93 100755 --- a/lucene/test-framework/src/java/org/apache/lucene/index/ForceMergePolicy.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/ForceMergePolicy.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 @@ -16,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import java.io.IOException; import java.util.Map; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/IndexWriterMaxDocsChanger.java b/lucene/test-framework/src/java/org/apache/lucene/index/IndexWriterMaxDocsChanger.java index 775a3def242..8dec9893483 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/IndexWriterMaxDocsChanger.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/IndexWriterMaxDocsChanger.java @@ -1,7 +1,3 @@ -package org.apache.lucene.index; - -import org.apache.lucene.util.LuceneTestCase; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import org.apache.lucene.util.LuceneTestCase; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + +import org.apache.lucene.util.LuceneTestCase; /** * Accessor to make some package protected methods in {@link IndexWriter} available for testing. diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/MismatchedDirectoryReader.java b/lucene/test-framework/src/java/org/apache/lucene/index/MismatchedDirectoryReader.java index 4e7f92e0767..76aecef4b24 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/MismatchedDirectoryReader.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/MismatchedDirectoryReader.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 @@ -16,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import java.io.IOException; import java.util.Random; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/MismatchedLeafReader.java b/lucene/test-framework/src/java/org/apache/lucene/index/MismatchedLeafReader.java index 664e76a6c2a..38c1d7fccc9 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/MismatchedLeafReader.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/MismatchedLeafReader.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 @@ -16,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/MockRandomMergePolicy.java b/lucene/test-framework/src/java/org/apache/lucene/index/MockRandomMergePolicy.java index 66c5d116118..bcee1b6c4e1 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/MockRandomMergePolicy.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/MockRandomMergePolicy.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 @@ -16,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/PerThreadPKLookup.java b/lucene/test-framework/src/java/org/apache/lucene/index/PerThreadPKLookup.java index d94395d69ee..c417a886450 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/PerThreadPKLookup.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/PerThreadPKLookup.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 @@ -16,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java b/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java index 5a06e121bcd..986dd34a601 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.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 @@ -16,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import java.util.ArrayList; import java.util.Collections; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java b/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java index 047ef4b5458..8dc96d9ff34 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.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 @@ -16,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import java.io.Closeable; import java.io.IOException; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/RandomPostingsTester.java b/lucene/test-framework/src/java/org/apache/lucene/index/RandomPostingsTester.java index 27ba50274c6..3cafc9cde13 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/RandomPostingsTester.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/RandomPostingsTester.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 @@ -16,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import java.io.IOException; import java.nio.file.Path; diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/SuppressingConcurrentMergeScheduler.java b/lucene/test-framework/src/java/org/apache/lucene/index/SuppressingConcurrentMergeScheduler.java index cebe5844ad5..185749ee459 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/SuppressingConcurrentMergeScheduler.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/SuppressingConcurrentMergeScheduler.java @@ -1,7 +1,3 @@ -package org.apache.lucene.index; - -import org.apache.lucene.store.Directory; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import org.apache.lucene.store.Directory; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; + +import org.apache.lucene.store.Directory; /** A {@link ConcurrentMergeScheduler} that ignores AlreadyClosedException. */ public abstract class SuppressingConcurrentMergeScheduler extends ConcurrentMergeScheduler { diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java index 3d6e43cd399..15a0537e8b0 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.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 @@ -16,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import java.io.IOException; import java.nio.file.Path; diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/DisableFsyncFS.java b/lucene/test-framework/src/java/org/apache/lucene/mockfile/DisableFsyncFS.java index 746a7f71b1d..66be5219d3a 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/DisableFsyncFS.java +++ b/lucene/test-framework/src/java/org/apache/lucene/mockfile/DisableFsyncFS.java @@ -1,15 +1,3 @@ -package org.apache.lucene.mockfile; - -import java.io.IOException; -import java.nio.channels.AsynchronousFileChannel; -import java.nio.channels.FileChannel; -import java.nio.file.FileSystem; -import java.nio.file.OpenOption; -import java.nio.file.Path; -import java.nio.file.attribute.FileAttribute; -import java.util.Set; -import java.util.concurrent.ExecutorService; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -26,6 +14,17 @@ import java.util.concurrent.ExecutorService; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.mockfile; + +import java.io.IOException; +import java.nio.channels.AsynchronousFileChannel; +import java.nio.channels.FileChannel; +import java.nio.file.FileSystem; +import java.nio.file.OpenOption; +import java.nio.file.Path; +import java.nio.file.attribute.FileAttribute; +import java.util.Set; +import java.util.concurrent.ExecutorService; /** * Disables actual calls to fsync. diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/ExtrasFS.java b/lucene/test-framework/src/java/org/apache/lucene/mockfile/ExtrasFS.java index 03a198ae8e8..28fc44f4519 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/ExtrasFS.java +++ b/lucene/test-framework/src/java/org/apache/lucene/mockfile/ExtrasFS.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 @@ -16,6 +14,7 @@ package org.apache.lucene.mockfile; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.mockfile; import java.io.IOException; import java.nio.file.FileSystem; diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterAsynchronousFileChannel.java b/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterAsynchronousFileChannel.java index 8956b0a6976..080b6e6f7da 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterAsynchronousFileChannel.java +++ b/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterAsynchronousFileChannel.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 @@ -16,6 +14,7 @@ package org.apache.lucene.mockfile; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.mockfile; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterDirectoryStream.java b/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterDirectoryStream.java index c03ac841f61..8caf4fc2305 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterDirectoryStream.java +++ b/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterDirectoryStream.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 @@ -16,6 +14,7 @@ package org.apache.lucene.mockfile; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.mockfile; import java.io.IOException; import java.nio.file.DirectoryStream; diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterFileChannel.java b/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterFileChannel.java index bb92d081904..0c95af0ee63 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterFileChannel.java +++ b/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterFileChannel.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 @@ -16,6 +14,7 @@ package org.apache.lucene.mockfile; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.mockfile; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterFileStore.java b/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterFileStore.java index fd93bdc2966..dc90799d6ec 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterFileStore.java +++ b/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterFileStore.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 @@ -16,6 +14,7 @@ package org.apache.lucene.mockfile; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.mockfile; import java.io.IOException; import java.nio.file.FileStore; diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterFileSystem.java b/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterFileSystem.java index d2b0b40a5e6..d79ed35e7f5 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterFileSystem.java +++ b/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterFileSystem.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 @@ -16,6 +14,7 @@ package org.apache.lucene.mockfile; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.mockfile; import java.io.IOException; import java.nio.file.FileStore; diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterFileSystemProvider.java b/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterFileSystemProvider.java index 1fe6dacbaf9..c9c016551c8 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterFileSystemProvider.java +++ b/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterFileSystemProvider.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 @@ -16,6 +14,7 @@ package org.apache.lucene.mockfile; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.mockfile; import java.io.IOException; import java.io.InputStream; diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterInputStream2.java b/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterInputStream2.java index 32816090cb8..aed5660c66d 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterInputStream2.java +++ b/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterInputStream2.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 @@ -16,6 +14,7 @@ package org.apache.lucene.mockfile; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.mockfile; import java.io.FilterInputStream; import java.io.IOException; diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterOutputStream2.java b/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterOutputStream2.java index 010c7dd34b5..dbf7a95bb71 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterOutputStream2.java +++ b/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterOutputStream2.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 @@ -16,6 +14,7 @@ package org.apache.lucene.mockfile; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.mockfile; import java.io.FilterOutputStream; import java.io.IOException; diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterPath.java b/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterPath.java index 918890f50eb..8e6a8fb1da5 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterPath.java +++ b/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterPath.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 @@ -16,6 +14,7 @@ package org.apache.lucene.mockfile; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.mockfile; import java.io.File; import java.io.IOException; diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterSeekableByteChannel.java b/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterSeekableByteChannel.java index 12a6d12ef3e..d627e363167 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterSeekableByteChannel.java +++ b/lucene/test-framework/src/java/org/apache/lucene/mockfile/FilterSeekableByteChannel.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 @@ -16,6 +14,7 @@ package org.apache.lucene.mockfile; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.mockfile; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/HandleLimitFS.java b/lucene/test-framework/src/java/org/apache/lucene/mockfile/HandleLimitFS.java index 580f2c7c881..0cdbf0ddc30 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/HandleLimitFS.java +++ b/lucene/test-framework/src/java/org/apache/lucene/mockfile/HandleLimitFS.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 @@ -16,6 +14,7 @@ package org.apache.lucene.mockfile; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.mockfile; import java.io.IOException; import java.nio.file.FileSystem; diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/HandleTrackingFS.java b/lucene/test-framework/src/java/org/apache/lucene/mockfile/HandleTrackingFS.java index 1b759f10527..ee6ceb710fa 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/HandleTrackingFS.java +++ b/lucene/test-framework/src/java/org/apache/lucene/mockfile/HandleTrackingFS.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 @@ -16,6 +14,7 @@ package org.apache.lucene.mockfile; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.mockfile; import java.io.Closeable; import java.io.IOException; diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/LeakFS.java b/lucene/test-framework/src/java/org/apache/lucene/mockfile/LeakFS.java index c3a4e8c4a3c..f76565a0a5f 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/LeakFS.java +++ b/lucene/test-framework/src/java/org/apache/lucene/mockfile/LeakFS.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 @@ -16,6 +14,7 @@ package org.apache.lucene.mockfile; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.mockfile; import java.nio.file.FileSystem; import java.nio.file.Path; diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/MockFileSystemTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/mockfile/MockFileSystemTestCase.java index f5bb022a7a3..0ab96cd9796 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/MockFileSystemTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/mockfile/MockFileSystemTestCase.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 @@ -16,6 +14,7 @@ package org.apache.lucene.mockfile; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.mockfile; import java.io.IOException; import java.io.OutputStream; diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/ShuffleFS.java b/lucene/test-framework/src/java/org/apache/lucene/mockfile/ShuffleFS.java index 45be788a1cf..01fc2f5f423 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/ShuffleFS.java +++ b/lucene/test-framework/src/java/org/apache/lucene/mockfile/ShuffleFS.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 @@ -16,6 +14,7 @@ package org.apache.lucene.mockfile; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.mockfile; import java.io.IOException; import java.nio.file.DirectoryStream; diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/VerboseFS.java b/lucene/test-framework/src/java/org/apache/lucene/mockfile/VerboseFS.java index 508b389cd40..5ca3493a07d 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/VerboseFS.java +++ b/lucene/test-framework/src/java/org/apache/lucene/mockfile/VerboseFS.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 @@ -16,6 +14,7 @@ package org.apache.lucene.mockfile; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.mockfile; import java.io.IOException; import java.io.OutputStream; diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/WindowsFS.java b/lucene/test-framework/src/java/org/apache/lucene/mockfile/WindowsFS.java index a4cfe2dde8e..f3046420821 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/WindowsFS.java +++ b/lucene/test-framework/src/java/org/apache/lucene/mockfile/WindowsFS.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 @@ -16,6 +14,7 @@ package org.apache.lucene.mockfile; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.mockfile; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/package-info.java b/lucene/test-framework/src/java/org/apache/lucene/mockfile/package-info.java index a7bdcaea974..5272b6d67df 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/package-info.java +++ b/lucene/test-framework/src/java/org/apache/lucene/mockfile/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Support for testing/debugging with virtual filesystems *

diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/AssertingBulkScorer.java b/lucene/test-framework/src/java/org/apache/lucene/search/AssertingBulkScorer.java index 07cdd9da465..cc3d0b30fe3 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/AssertingBulkScorer.java +++ b/lucene/test-framework/src/java/org/apache/lucene/search/AssertingBulkScorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import java.io.IOException; import java.util.Random; diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/AssertingCollector.java b/lucene/test-framework/src/java/org/apache/lucene/search/AssertingCollector.java index 838c85e477f..22cd6861dec 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/AssertingCollector.java +++ b/lucene/test-framework/src/java/org/apache/lucene/search/AssertingCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import java.io.IOException; import java.util.Random; diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/AssertingIndexSearcher.java b/lucene/test-framework/src/java/org/apache/lucene/search/AssertingIndexSearcher.java index 43d07d610c8..7bc4b4aff75 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/AssertingIndexSearcher.java +++ b/lucene/test-framework/src/java/org/apache/lucene/search/AssertingIndexSearcher.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import java.io.IOException; import java.util.List; diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/AssertingLeafCollector.java b/lucene/test-framework/src/java/org/apache/lucene/search/AssertingLeafCollector.java index 621e81231df..2b288008b79 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/AssertingLeafCollector.java +++ b/lucene/test-framework/src/java/org/apache/lucene/search/AssertingLeafCollector.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import java.io.IOException; import java.util.Random; diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/AssertingQuery.java b/lucene/test-framework/src/java/org/apache/lucene/search/AssertingQuery.java index 24672ea5947..1dfc97bbbd0 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/AssertingQuery.java +++ b/lucene/test-framework/src/java/org/apache/lucene/search/AssertingQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import java.io.IOException; import java.util.Random; diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/AssertingScorer.java b/lucene/test-framework/src/java/org/apache/lucene/search/AssertingScorer.java index 0676923d68d..1aad1409b4d 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/AssertingScorer.java +++ b/lucene/test-framework/src/java/org/apache/lucene/search/AssertingScorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import java.io.IOException; import java.util.Collection; diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/AssertingWeight.java b/lucene/test-framework/src/java/org/apache/lucene/search/AssertingWeight.java index 6ab520d1976..29ca12e2af6 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/AssertingWeight.java +++ b/lucene/test-framework/src/java/org/apache/lucene/search/AssertingWeight.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import java.io.IOException; import java.util.Random; diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/BaseExplanationTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/search/BaseExplanationTestCase.java index f9ec989dea7..cde2cdd966e 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/BaseExplanationTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/search/BaseExplanationTestCase.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.MockAnalyzer; diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/BulkScorerWrapperScorer.java b/lucene/test-framework/src/java/org/apache/lucene/search/BulkScorerWrapperScorer.java index 85e723eb7a5..91ec9bb75d7 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/BulkScorerWrapperScorer.java +++ b/lucene/test-framework/src/java/org/apache/lucene/search/BulkScorerWrapperScorer.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import java.io.IOException; import java.util.Arrays; diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/CheckHits.java b/lucene/test-framework/src/java/org/apache/lucene/search/CheckHits.java index f7bc9837c56..4eacda743c8 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/CheckHits.java +++ b/lucene/test-framework/src/java/org/apache/lucene/search/CheckHits.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import java.io.IOException; import java.util.Locale; diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java b/lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java index 6de6213675b..c92addefd45 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java +++ b/lucene/test-framework/src/java/org/apache/lucene/search/QueryUtils.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import java.io.IOException; import java.util.Collections; diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/RandomApproximationQuery.java b/lucene/test-framework/src/java/org/apache/lucene/search/RandomApproximationQuery.java index 109220474b1..f628147fecb 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/RandomApproximationQuery.java +++ b/lucene/test-framework/src/java/org/apache/lucene/search/RandomApproximationQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import java.io.IOException; import java.util.Random; diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/ScorerIndexSearcher.java b/lucene/test-framework/src/java/org/apache/lucene/search/ScorerIndexSearcher.java index e46e31be37a..ae699130190 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/ScorerIndexSearcher.java +++ b/lucene/test-framework/src/java/org/apache/lucene/search/ScorerIndexSearcher.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import java.io.IOException; import java.util.List; diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/SearchEquivalenceTestBase.java b/lucene/test-framework/src/java/org/apache/lucene/search/SearchEquivalenceTestBase.java index 0c0f1ce1ed0..fb5dc66b2f6 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/SearchEquivalenceTestBase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/search/SearchEquivalenceTestBase.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import java.util.BitSet; import java.util.Random; diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/ShardSearchingTestBase.java b/lucene/test-framework/src/java/org/apache/lucene/search/ShardSearchingTestBase.java index ed7def5886f..52c16dc63b2 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/ShardSearchingTestBase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/search/ShardSearchingTestBase.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search; - /* * 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.lucene.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search; import java.io.Closeable; import java.io.IOException; diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/similarities/RandomSimilarity.java b/lucene/test-framework/src/java/org/apache/lucene/search/similarities/RandomSimilarity.java index 1893f0e9822..2c459fcd017 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/similarities/RandomSimilarity.java +++ b/lucene/test-framework/src/java/org/apache/lucene/search/similarities/RandomSimilarity.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.similarities; - /* * 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.lucene.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.similarities; import java.util.ArrayList; import java.util.Collections; diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/spans/AssertingSpanQuery.java b/lucene/test-framework/src/java/org/apache/lucene/search/spans/AssertingSpanQuery.java index 9de67b89b2f..bf98ba1a4c6 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/spans/AssertingSpanQuery.java +++ b/lucene/test-framework/src/java/org/apache/lucene/search/spans/AssertingSpanQuery.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * 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.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; import org.apache.lucene.index.IndexReader; import org.apache.lucene.search.IndexSearcher; diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/spans/AssertingSpanWeight.java b/lucene/test-framework/src/java/org/apache/lucene/search/spans/AssertingSpanWeight.java index 9abbf68b7ad..ae20d832c81 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/spans/AssertingSpanWeight.java +++ b/lucene/test-framework/src/java/org/apache/lucene/search/spans/AssertingSpanWeight.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * 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.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; import java.io.IOException; import java.util.Map; diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/spans/AssertingSpans.java b/lucene/test-framework/src/java/org/apache/lucene/search/spans/AssertingSpans.java index 8b8c36cc4f9..9dba2c78b30 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/spans/AssertingSpans.java +++ b/lucene/test-framework/src/java/org/apache/lucene/search/spans/AssertingSpans.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * 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.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; import java.io.IOException; diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/spans/MultiSpansWrapper.java b/lucene/test-framework/src/java/org/apache/lucene/search/spans/MultiSpansWrapper.java index af580c74c60..9915067ad14 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/spans/MultiSpansWrapper.java +++ b/lucene/test-framework/src/java/org/apache/lucene/search/spans/MultiSpansWrapper.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * 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.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; import java.io.IOException; diff --git a/lucene/test-framework/src/java/org/apache/lucene/search/spans/SpanTestUtil.java b/lucene/test-framework/src/java/org/apache/lucene/search/spans/SpanTestUtil.java index a88c6ae515a..138804366d5 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/search/spans/SpanTestUtil.java +++ b/lucene/test-framework/src/java/org/apache/lucene/search/spans/SpanTestUtil.java @@ -1,5 +1,3 @@ -package org.apache.lucene.search.spans; - /* * 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.lucene.search.spans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.search.spans; import java.io.IOException; diff --git a/lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryTestCase.java index c01535147c2..8690b1ed3aa 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryTestCase.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 @@ -16,6 +14,7 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; import java.io.EOFException; import java.io.FileNotFoundException; diff --git a/lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryWrapper.java b/lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryWrapper.java index 23638261c12..c928088e05e 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryWrapper.java +++ b/lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryWrapper.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 @@ -16,6 +14,7 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; import java.io.IOException; diff --git a/lucene/test-framework/src/java/org/apache/lucene/store/BaseLockFactoryTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/store/BaseLockFactoryTestCase.java index 13bc0ffb3d0..512a0000895 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/store/BaseLockFactoryTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/store/BaseLockFactoryTestCase.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 @@ -16,6 +14,7 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; diff --git a/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java b/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java index ec99c7efee4..0f35be74fad 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java +++ b/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.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 @@ -16,6 +14,7 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; import java.io.Closeable; import java.io.FileNotFoundException; diff --git a/lucene/test-framework/src/java/org/apache/lucene/store/MockIndexInputWrapper.java b/lucene/test-framework/src/java/org/apache/lucene/store/MockIndexInputWrapper.java index 53a425331ae..f62d67b9392 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/store/MockIndexInputWrapper.java +++ b/lucene/test-framework/src/java/org/apache/lucene/store/MockIndexInputWrapper.java @@ -1,10 +1,3 @@ -package org.apache.lucene.store; - -import java.io.Closeable; -import java.io.IOException; -import java.util.Map; -import java.util.Set; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -21,6 +14,12 @@ import java.util.Set; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; + +import java.io.Closeable; +import java.io.IOException; +import java.util.Map; +import java.util.Set; /** * Used by MockDirectoryWrapper to create an input stream that diff --git a/lucene/test-framework/src/java/org/apache/lucene/store/MockIndexOutputWrapper.java b/lucene/test-framework/src/java/org/apache/lucene/store/MockIndexOutputWrapper.java index d4e902abd46..510e930f7a5 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/store/MockIndexOutputWrapper.java +++ b/lucene/test-framework/src/java/org/apache/lucene/store/MockIndexOutputWrapper.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 @@ -16,6 +14,7 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; import java.io.Closeable; import java.io.IOException; diff --git a/lucene/test-framework/src/java/org/apache/lucene/store/RawDirectoryWrapper.java b/lucene/test-framework/src/java/org/apache/lucene/store/RawDirectoryWrapper.java index 67dbde7524f..6ceae351d83 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/store/RawDirectoryWrapper.java +++ b/lucene/test-framework/src/java/org/apache/lucene/store/RawDirectoryWrapper.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 @@ -16,6 +14,7 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; import java.io.IOException; diff --git a/lucene/test-framework/src/java/org/apache/lucene/store/SlowClosingMockIndexInputWrapper.java b/lucene/test-framework/src/java/org/apache/lucene/store/SlowClosingMockIndexInputWrapper.java index bc2e1da8571..2be2e2792b3 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/store/SlowClosingMockIndexInputWrapper.java +++ b/lucene/test-framework/src/java/org/apache/lucene/store/SlowClosingMockIndexInputWrapper.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 @@ -16,6 +14,7 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; import java.io.IOException; diff --git a/lucene/test-framework/src/java/org/apache/lucene/store/SlowOpeningMockIndexInputWrapper.java b/lucene/test-framework/src/java/org/apache/lucene/store/SlowOpeningMockIndexInputWrapper.java index fd828e85273..4cc2b19665c 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/store/SlowOpeningMockIndexInputWrapper.java +++ b/lucene/test-framework/src/java/org/apache/lucene/store/SlowOpeningMockIndexInputWrapper.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 @@ -16,6 +14,7 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; import java.io.IOException; diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/AbstractBeforeAfterRule.java b/lucene/test-framework/src/java/org/apache/lucene/util/AbstractBeforeAfterRule.java index fc82bacaf9f..1bd4bed5f2d 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/AbstractBeforeAfterRule.java +++ b/lucene/test-framework/src/java/org/apache/lucene/util/AbstractBeforeAfterRule.java @@ -1,15 +1,3 @@ -package org.apache.lucene.util; - -import java.util.ArrayList; - -import org.junit.After; -import org.junit.AfterClass; -import org.junit.rules.RuleChain; -import org.junit.rules.TestRule; -import org.junit.runner.Description; -import org.junit.runners.model.MultipleFailureException; -import org.junit.runners.model.Statement; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -26,6 +14,17 @@ import org.junit.runners.model.Statement; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + +import java.util.ArrayList; + +import org.junit.After; +import org.junit.AfterClass; +import org.junit.rules.RuleChain; +import org.junit.rules.TestRule; +import org.junit.runner.Description; +import org.junit.runners.model.MultipleFailureException; +import org.junit.runners.model.Statement; /** * A {@link TestRule} that guarantees the execution of {@link #after} even diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/BaseBitSetTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/util/BaseBitSetTestCase.java index f59c63a0ac2..5f8cc00c998 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/BaseBitSetTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/util/BaseBitSetTestCase.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * 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.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; import java.io.IOException; import java.util.Collection; diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/BaseDocIdSetTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/util/BaseDocIdSetTestCase.java index 95e1ef927ae..fc2428548ed 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/BaseDocIdSetTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/util/BaseDocIdSetTestCase.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * 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.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; import static org.apache.lucene.util.BaseBitSetTestCase.randomSet; diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/CloseableDirectory.java b/lucene/test-framework/src/java/org/apache/lucene/util/CloseableDirectory.java index 57a21320725..6be51f734b6 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/CloseableDirectory.java +++ b/lucene/test-framework/src/java/org/apache/lucene/util/CloseableDirectory.java @@ -1,11 +1,3 @@ -package org.apache.lucene.util; - -import java.io.Closeable; - -import org.apache.lucene.store.BaseDirectoryWrapper; -import org.apache.lucene.store.MockDirectoryWrapper; -import org.junit.Assert; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -22,6 +14,13 @@ import org.junit.Assert; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + +import java.io.Closeable; + +import org.apache.lucene.store.BaseDirectoryWrapper; +import org.apache.lucene.store.MockDirectoryWrapper; +import org.junit.Assert; /** * Attempts to close a {@link BaseDirectoryWrapper}. diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/English.java b/lucene/test-framework/src/java/org/apache/lucene/util/English.java index 5ff95a4ae2f..98e4e89c7c6 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/English.java +++ b/lucene/test-framework/src/java/org/apache/lucene/util/English.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -7,15 +5,16 @@ package org.apache.lucene.util; * 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 - *

+ * + * 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.util; /** * Converts numbers to english strings for testing. diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/FailOnNonBulkMergesInfoStream.java b/lucene/test-framework/src/java/org/apache/lucene/util/FailOnNonBulkMergesInfoStream.java index a9b8c35d0ca..fb5fcf939df 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/FailOnNonBulkMergesInfoStream.java +++ b/lucene/test-framework/src/java/org/apache/lucene/util/FailOnNonBulkMergesInfoStream.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * 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.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; import java.io.IOException; diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/FailureMarker.java b/lucene/test-framework/src/java/org/apache/lucene/util/FailureMarker.java index 7487f87aaf7..39453621ecc 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/FailureMarker.java +++ b/lucene/test-framework/src/java/org/apache/lucene/util/FailureMarker.java @@ -1,10 +1,3 @@ -package org.apache.lucene.util; - -import java.util.concurrent.atomic.AtomicInteger; - -import org.junit.runner.notification.Failure; -import org.junit.runner.notification.RunListener; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -21,6 +14,12 @@ import org.junit.runner.notification.RunListener; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + +import java.util.concurrent.atomic.AtomicInteger; + +import org.junit.runner.notification.Failure; +import org.junit.runner.notification.RunListener; /** * A {@link RunListener} that detects suite/ test failures. We need it because failures diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/LineFileDocs.java b/lucene/test-framework/src/java/org/apache/lucene/util/LineFileDocs.java index a198130cf87..26d7cc3c62a 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/LineFileDocs.java +++ b/lucene/test-framework/src/java/org/apache/lucene/util/LineFileDocs.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * 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.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; import java.io.BufferedReader; import java.io.Closeable; diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/LuceneJUnit3MethodProvider.java b/lucene/test-framework/src/java/org/apache/lucene/util/LuceneJUnit3MethodProvider.java index 47ba67f5cf7..23b177fc227 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/LuceneJUnit3MethodProvider.java +++ b/lucene/test-framework/src/java/org/apache/lucene/util/LuceneJUnit3MethodProvider.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * 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.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; import java.lang.reflect.Method; import java.lang.reflect.Modifier; diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java index c7c45c41c22..caf36ce45f0 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * 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.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; import java.io.Closeable; import java.io.FileNotFoundException; diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/NullInfoStream.java b/lucene/test-framework/src/java/org/apache/lucene/util/NullInfoStream.java index 717d7dea465..0a121c9d182 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/NullInfoStream.java +++ b/lucene/test-framework/src/java/org/apache/lucene/util/NullInfoStream.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * 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.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; import java.io.IOException; diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/QuickPatchThreadsFilter.java b/lucene/test-framework/src/java/org/apache/lucene/util/QuickPatchThreadsFilter.java index 8b78ff0caa7..8447e90b904 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/QuickPatchThreadsFilter.java +++ b/lucene/test-framework/src/java/org/apache/lucene/util/QuickPatchThreadsFilter.java @@ -1,7 +1,3 @@ -package org.apache.lucene.util; - -import com.carrotsearch.randomizedtesting.ThreadFilter; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import com.carrotsearch.randomizedtesting.ThreadFilter; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + +import com.carrotsearch.randomizedtesting.ThreadFilter; /** * Last minute patches. diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/RamUsageTester.java b/lucene/test-framework/src/java/org/apache/lucene/util/RamUsageTester.java index 5da98d1cdf5..985052654c1 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/RamUsageTester.java +++ b/lucene/test-framework/src/java/org/apache/lucene/util/RamUsageTester.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * 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.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; import java.lang.reflect.Array; import java.lang.reflect.Field; diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/RemoveUponClose.java b/lucene/test-framework/src/java/org/apache/lucene/util/RemoveUponClose.java index 90a97ae75a6..af4ec85d1dd 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/RemoveUponClose.java +++ b/lucene/test-framework/src/java/org/apache/lucene/util/RemoveUponClose.java @@ -1,10 +1,3 @@ -package org.apache.lucene.util; - -import java.io.Closeable; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -12,15 +5,21 @@ import java.nio.file.Path; * 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 - * + * + * 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.util; + +import java.io.Closeable; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; /** * A {@link Closeable} that attempts to remove a given file/folder. diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/Rethrow.java b/lucene/test-framework/src/java/org/apache/lucene/util/Rethrow.java index 9946dad5977..9e52a1975d9 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/Rethrow.java +++ b/lucene/test-framework/src/java/org/apache/lucene/util/Rethrow.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * 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.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; /** * Sneaky: rethrowing checked exceptions as unchecked diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/RunListenerPrintReproduceInfo.java b/lucene/test-framework/src/java/org/apache/lucene/util/RunListenerPrintReproduceInfo.java index 8762e637795..3d4f4fd9819 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/RunListenerPrintReproduceInfo.java +++ b/lucene/test-framework/src/java/org/apache/lucene/util/RunListenerPrintReproduceInfo.java @@ -1,20 +1,3 @@ -package org.apache.lucene.util; - -import static org.apache.lucene.util.LuceneTestCase.*; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.regex.Pattern; - -import org.junit.runner.Description; -import org.junit.runner.Result; -import org.junit.runner.notification.Failure; -import org.junit.runner.notification.RunListener; - -import com.carrotsearch.randomizedtesting.LifecycleScope; -import com.carrotsearch.randomizedtesting.RandomizedContext; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -31,6 +14,22 @@ import com.carrotsearch.randomizedtesting.RandomizedContext; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + +import static org.apache.lucene.util.LuceneTestCase.*; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.regex.Pattern; + +import org.junit.runner.Description; +import org.junit.runner.Result; +import org.junit.runner.notification.Failure; +import org.junit.runner.notification.RunListener; + +import com.carrotsearch.randomizedtesting.LifecycleScope; +import com.carrotsearch.randomizedtesting.RandomizedContext; /** * A suite listener printing a "reproduce string". This ensures test result diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleAssertionsRequired.java b/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleAssertionsRequired.java index 8ce1bf78c48..baf8e32fe91 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleAssertionsRequired.java +++ b/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleAssertionsRequired.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * 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.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; import org.junit.rules.TestRule; import org.junit.runner.Description; diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleDelegate.java b/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleDelegate.java index 53d1d430385..515afd68534 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleDelegate.java +++ b/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleDelegate.java @@ -1,11 +1,3 @@ -package org.apache.lucene.util; - -import java.util.concurrent.atomic.AtomicReference; - -import org.junit.rules.TestRule; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -22,6 +14,13 @@ import org.junit.runners.model.Statement; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + +import java.util.concurrent.atomic.AtomicReference; + +import org.junit.rules.TestRule; +import org.junit.runner.Description; +import org.junit.runners.model.Statement; /** * A {@link TestRule} that delegates to another {@link TestRule} via a delegate diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleIgnoreAfterMaxFailures.java b/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleIgnoreAfterMaxFailures.java index f3296f37825..34357617615 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleIgnoreAfterMaxFailures.java +++ b/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleIgnoreAfterMaxFailures.java @@ -1,14 +1,3 @@ -package org.apache.lucene.util; - -import org.junit.Assert; -import org.junit.internal.AssumptionViolatedException; -import org.junit.rules.TestRule; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; - -import com.carrotsearch.randomizedtesting.RandomizedTest; -import com.carrotsearch.randomizedtesting.annotations.Repeat; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -25,6 +14,16 @@ import com.carrotsearch.randomizedtesting.annotations.Repeat; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + +import org.junit.Assert; +import org.junit.internal.AssumptionViolatedException; +import org.junit.rules.TestRule; +import org.junit.runner.Description; +import org.junit.runners.model.Statement; + +import com.carrotsearch.randomizedtesting.RandomizedTest; +import com.carrotsearch.randomizedtesting.annotations.Repeat; /** * This rule keeps a count of failed tests (suites) and will result in an diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleIgnoreTestSuites.java b/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleIgnoreTestSuites.java index 69436788a2a..bf4805eb41d 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleIgnoreTestSuites.java +++ b/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleIgnoreTestSuites.java @@ -1,9 +1,3 @@ -package org.apache.lucene.util; - -import org.junit.rules.TestRule; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -20,6 +14,11 @@ import org.junit.runners.model.Statement; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + +import org.junit.rules.TestRule; +import org.junit.runner.Description; +import org.junit.runners.model.Statement; /** * This rule will cause the suite to be assumption-ignored if diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleLimitSysouts.java b/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleLimitSysouts.java index b3e783ec4c9..fe1a172b5c0 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleLimitSysouts.java +++ b/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleLimitSysouts.java @@ -1,3 +1,19 @@ +/* + * 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.util; import java.io.FilterOutputStream; @@ -23,23 +39,6 @@ import com.carrotsearch.randomizedtesting.RandomizedTest; import com.carrotsearch.randomizedtesting.rules.TestRuleAdapter; -/* - * 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. - */ - /** * Fails the suite if it prints over the given limit of bytes to either * {@link System#out} or {@link System#err}, diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleMarkFailure.java b/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleMarkFailure.java index be9c625c711..11558db4bee 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleMarkFailure.java +++ b/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleMarkFailure.java @@ -1,13 +1,3 @@ -package org.apache.lucene.util; - -import java.util.ArrayList; -import java.util.List; - -import org.junit.internal.AssumptionViolatedException; -import org.junit.rules.TestRule; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -24,6 +14,15 @@ import org.junit.runners.model.Statement; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + +import java.util.ArrayList; +import java.util.List; + +import org.junit.internal.AssumptionViolatedException; +import org.junit.rules.TestRule; +import org.junit.runner.Description; +import org.junit.runners.model.Statement; /** * A rule for marking failed tests and suites. diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleRestoreSystemProperties.java b/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleRestoreSystemProperties.java index 395af0e7fb9..c554fefa19e 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleRestoreSystemProperties.java +++ b/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleRestoreSystemProperties.java @@ -1,12 +1,3 @@ -package org.apache.lucene.util; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule; -import com.carrotsearch.randomizedtesting.rules.TestRuleAdapter; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -23,6 +14,14 @@ import com.carrotsearch.randomizedtesting.rules.TestRuleAdapter; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule; +import com.carrotsearch.randomizedtesting.rules.TestRuleAdapter; /** * Restore a given set of system properties to a snapshot taken at the beginning diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java b/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java index 085111a63d7..7ac40375f15 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java +++ b/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreClassEnv.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * 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.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; import java.io.PrintStream; import java.util.Arrays; diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreInstanceEnv.java b/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreInstanceEnv.java index 84420271da3..62f57128688 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreInstanceEnv.java +++ b/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupAndRestoreInstanceEnv.java @@ -1,7 +1,3 @@ -package org.apache.lucene.util; - -import org.apache.lucene.search.BooleanQuery; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import org.apache.lucene.search.BooleanQuery; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + +import org.apache.lucene.search.BooleanQuery; /** * Prepares and restores {@link LuceneTestCase} at instance level diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupTeardownChained.java b/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupTeardownChained.java index 3073694ba2e..a169269b0bf 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupTeardownChained.java +++ b/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleSetupTeardownChained.java @@ -1,10 +1,3 @@ -package org.apache.lucene.util; - -import org.junit.Assert; -import org.junit.rules.TestRule; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -21,6 +14,12 @@ import org.junit.runners.model.Statement; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + +import org.junit.Assert; +import org.junit.rules.TestRule; +import org.junit.runner.Description; +import org.junit.runners.model.Statement; /** * Make sure {@link LuceneTestCase#setUp()} and {@link LuceneTestCase#tearDown()} were invoked even if they diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleStoreClassName.java b/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleStoreClassName.java index 1f17fbb5fff..8e3332f9fee 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleStoreClassName.java +++ b/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleStoreClassName.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * 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.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; import org.junit.rules.TestRule; import org.junit.runner.Description; diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleTemporaryFilesCleanup.java b/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleTemporaryFilesCleanup.java index 86f685abb07..d6e69f095e1 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleTemporaryFilesCleanup.java +++ b/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleTemporaryFilesCleanup.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * 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.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; import java.io.IOException; import java.net.URI; diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleThreadAndTestName.java b/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleThreadAndTestName.java index 1803ebb9e17..059fcea6086 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleThreadAndTestName.java +++ b/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleThreadAndTestName.java @@ -1,9 +1,3 @@ -package org.apache.lucene.util; - -import org.junit.rules.TestRule; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -20,6 +14,11 @@ import org.junit.runners.model.Statement; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + +import org.junit.rules.TestRule; +import org.junit.runner.Description; +import org.junit.runners.model.Statement; /** * Saves the executing thread and method name of the test case. diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/TestSecurityManager.java b/lucene/test-framework/src/java/org/apache/lucene/util/TestSecurityManager.java index 63cc97ec1ec..99c62700445 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/TestSecurityManager.java +++ b/lucene/test-framework/src/java/org/apache/lucene/util/TestSecurityManager.java @@ -1,8 +1,3 @@ -package org.apache.lucene.util; - -import java.security.AccessController; -import java.security.PrivilegedAction; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -19,6 +14,10 @@ import java.security.PrivilegedAction; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + +import java.security.AccessController; +import java.security.PrivilegedAction; /** * A {@link SecurityManager} that prevents tests calling {@link System#exit(int)}. diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/TestUtil.java b/lucene/test-framework/src/java/org/apache/lucene/util/TestUtil.java index 99d4be3ebe2..794b7cbe1a1 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/TestUtil.java +++ b/lucene/test-framework/src/java/org/apache/lucene/util/TestUtil.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * 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.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; import java.io.BufferedInputStream; import java.io.ByteArrayOutputStream; diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/ThrottledIndexOutput.java b/lucene/test-framework/src/java/org/apache/lucene/util/ThrottledIndexOutput.java index 8d55acc55b7..d6366f92ba0 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/ThrottledIndexOutput.java +++ b/lucene/test-framework/src/java/org/apache/lucene/util/ThrottledIndexOutput.java @@ -1,14 +1,12 @@ -package org.apache.lucene.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with + * 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 + * the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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, @@ -16,6 +14,7 @@ package org.apache.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; import java.io.IOException; diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/TimeUnits.java b/lucene/test-framework/src/java/org/apache/lucene/util/TimeUnits.java index be7eeaa205c..431364c765c 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/TimeUnits.java +++ b/lucene/test-framework/src/java/org/apache/lucene/util/TimeUnits.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * 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.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; /** time unit constants for use in annotations. */ public final class TimeUnits { diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/automaton/AutomatonTestUtil.java b/lucene/test-framework/src/java/org/apache/lucene/util/automaton/AutomatonTestUtil.java index e27dba3472a..52a63a49693 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/automaton/AutomatonTestUtil.java +++ b/lucene/test-framework/src/java/org/apache/lucene/util/automaton/AutomatonTestUtil.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.automaton; - /* * 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.lucene.util.automaton; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util.automaton; import java.util.ArrayList; import java.util.HashMap; diff --git a/lucene/test-framework/src/java/org/apache/lucene/util/fst/FSTTester.java b/lucene/test-framework/src/java/org/apache/lucene/util/fst/FSTTester.java index a2ace6195ba..11b132572ed 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/util/fst/FSTTester.java +++ b/lucene/test-framework/src/java/org/apache/lucene/util/fst/FSTTester.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util.fst; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -7,15 +5,16 @@ package org.apache.lucene.util.fst; * 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 - *

+ * + * 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.util.fst; import java.io.IOException; import java.io.OutputStreamWriter; diff --git a/lucene/test-framework/src/test/org/apache/lucene/analysis/TestGraphTokenizers.java b/lucene/test-framework/src/test/org/apache/lucene/analysis/TestGraphTokenizers.java index 838243ccc79..78fb127f412 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/analysis/TestGraphTokenizers.java +++ b/lucene/test-framework/src/test/org/apache/lucene/analysis/TestGraphTokenizers.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 @@ -16,6 +14,7 @@ package org.apache.lucene.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis; import java.io.IOException; import java.io.PrintWriter; diff --git a/lucene/test-framework/src/test/org/apache/lucene/analysis/TestLookaheadTokenFilter.java b/lucene/test-framework/src/test/org/apache/lucene/analysis/TestLookaheadTokenFilter.java index 50539e55513..3168ba45732 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/analysis/TestLookaheadTokenFilter.java +++ b/lucene/test-framework/src/test/org/apache/lucene/analysis/TestLookaheadTokenFilter.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 @@ -16,6 +14,7 @@ package org.apache.lucene.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis; import java.io.IOException; import java.io.Reader; diff --git a/lucene/test-framework/src/test/org/apache/lucene/analysis/TestMockAnalyzer.java b/lucene/test-framework/src/test/org/apache/lucene/analysis/TestMockAnalyzer.java index 40b69df017e..22cd46701a5 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/analysis/TestMockAnalyzer.java +++ b/lucene/test-framework/src/test/org/apache/lucene/analysis/TestMockAnalyzer.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 @@ -16,6 +14,7 @@ package org.apache.lucene.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis; import java.io.Reader; import java.io.StringReader; diff --git a/lucene/test-framework/src/test/org/apache/lucene/analysis/TestMockCharFilter.java b/lucene/test-framework/src/test/org/apache/lucene/analysis/TestMockCharFilter.java index 617e6dcdb79..d8072b350a6 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/analysis/TestMockCharFilter.java +++ b/lucene/test-framework/src/test/org/apache/lucene/analysis/TestMockCharFilter.java @@ -1,8 +1,3 @@ -package org.apache.lucene.analysis; - -import java.io.IOException; -import java.io.Reader; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -19,6 +14,10 @@ import java.io.Reader; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis; + +import java.io.IOException; +import java.io.Reader; public class TestMockCharFilter extends BaseTokenStreamTestCase { diff --git a/lucene/test-framework/src/test/org/apache/lucene/analysis/TestPosition.java b/lucene/test-framework/src/test/org/apache/lucene/analysis/TestPosition.java index 389768b02a7..24087fccf9f 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/analysis/TestPosition.java +++ b/lucene/test-framework/src/test/org/apache/lucene/analysis/TestPosition.java @@ -1,6 +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 +14,8 @@ package org.apache.lucene.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis; + import org.junit.Ignore; diff --git a/lucene/test-framework/src/test/org/apache/lucene/analysis/TrivialLookaheadFilter.java b/lucene/test-framework/src/test/org/apache/lucene/analysis/TrivialLookaheadFilter.java index cf50927291b..c370d89a759 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/analysis/TrivialLookaheadFilter.java +++ b/lucene/test-framework/src/test/org/apache/lucene/analysis/TrivialLookaheadFilter.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 @@ -16,6 +14,7 @@ package org.apache.lucene.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.analysis; import java.io.IOException; import java.util.ArrayList; diff --git a/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingDocValuesFormat.java b/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingDocValuesFormat.java index 5705a2e0062..62d468ff211 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingDocValuesFormat.java +++ b/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingDocValuesFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.asserting; - /* * 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.lucene.codecs.asserting; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.asserting; import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BaseDocValuesFormatTestCase; diff --git a/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingNormsFormat.java b/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingNormsFormat.java index d5adad045a7..1eda21bba1a 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingNormsFormat.java +++ b/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingNormsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.asserting; - /* * 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.lucene.codecs.asserting; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.asserting; import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BaseNormsFormatTestCase; diff --git a/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingPointFormat.java b/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingPointFormat.java index 514f673e510..9f79b70d30b 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingPointFormat.java +++ b/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingPointFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.asserting; - /* * 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.lucene.codecs.asserting; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.asserting; import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BasePointFormatTestCase; diff --git a/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingPostingsFormat.java b/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingPostingsFormat.java index 7c78596bc4a..6fdb675c542 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingPostingsFormat.java +++ b/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingPostingsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.asserting; - /* * 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.lucene.codecs.asserting; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.asserting; import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BasePostingsFormatTestCase; diff --git a/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingStoredFieldsFormat.java b/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingStoredFieldsFormat.java index 73fcf93348f..8f333fef671 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingStoredFieldsFormat.java +++ b/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingStoredFieldsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.asserting; - /* * 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.lucene.codecs.asserting; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.asserting; import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BaseTermVectorsFormatTestCase; diff --git a/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingTermVectorsFormat.java b/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingTermVectorsFormat.java index 09fbb481269..c333db8b8ed 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingTermVectorsFormat.java +++ b/lucene/test-framework/src/test/org/apache/lucene/codecs/asserting/TestAssertingTermVectorsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.asserting; - /* * 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.lucene.codecs.asserting; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.asserting; import org.apache.lucene.codecs.Codec; import org.apache.lucene.index.BaseTermVectorsFormatTestCase; diff --git a/lucene/test-framework/src/test/org/apache/lucene/codecs/compressing/TestCompressingStoredFieldsFormat.java b/lucene/test-framework/src/test/org/apache/lucene/codecs/compressing/TestCompressingStoredFieldsFormat.java index d416f8ad96f..a0548709ea1 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/codecs/compressing/TestCompressingStoredFieldsFormat.java +++ b/lucene/test-framework/src/test/org/apache/lucene/codecs/compressing/TestCompressingStoredFieldsFormat.java @@ -1,5 +1,3 @@ -package org.apache.lucene.codecs.compressing; - /* * 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.lucene.codecs.compressing; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.codecs.compressing; import java.io.IOException; import java.util.Random; diff --git a/lucene/test-framework/src/test/org/apache/lucene/codecs/compressing/TestCompressingTermVectorsFormat.java b/lucene/test-framework/src/test/org/apache/lucene/codecs/compressing/TestCompressingTermVectorsFormat.java index cde93db1b7e..4fa02786c70 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/codecs/compressing/TestCompressingTermVectorsFormat.java +++ b/lucene/test-framework/src/test/org/apache/lucene/codecs/compressing/TestCompressingTermVectorsFormat.java @@ -1,3 +1,19 @@ +/* + * 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.codecs.compressing; import java.io.IOException; @@ -24,23 +40,6 @@ import org.apache.lucene.index.TermsEnum.SeekStatus; import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; -/* - * 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 TestCompressingTermVectorsFormat extends BaseTermVectorsFormatTestCase { @Override diff --git a/lucene/test-framework/src/test/org/apache/lucene/index/TestAssertingLeafReader.java b/lucene/test-framework/src/test/org/apache/lucene/index/TestAssertingLeafReader.java index 96c040df0f5..b572289e914 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/index/TestAssertingLeafReader.java +++ b/lucene/test-framework/src/test/org/apache/lucene/index/TestAssertingLeafReader.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 @@ -16,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; diff --git a/lucene/test-framework/src/test/org/apache/lucene/index/TestForceMergePolicy.java b/lucene/test-framework/src/test/org/apache/lucene/index/TestForceMergePolicy.java index f4f0b06d452..ffb89989bca 100755 --- a/lucene/test-framework/src/test/org/apache/lucene/index/TestForceMergePolicy.java +++ b/lucene/test-framework/src/test/org/apache/lucene/index/TestForceMergePolicy.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 @@ -16,6 +14,7 @@ package org.apache.lucene.index; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.index; import org.apache.lucene.util.LuceneTestCase; diff --git a/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestDisableFsyncFS.java b/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestDisableFsyncFS.java index 75e7b0f6ed9..13adeba6f69 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestDisableFsyncFS.java +++ b/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestDisableFsyncFS.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 @@ -16,6 +14,7 @@ package org.apache.lucene.mockfile; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.mockfile; import java.net.URI; import java.nio.ByteBuffer; diff --git a/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestExtrasFS.java b/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestExtrasFS.java index b1400134f0a..12cb09e84e4 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestExtrasFS.java +++ b/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestExtrasFS.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 @@ -16,6 +14,7 @@ package org.apache.lucene.mockfile; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.mockfile; import java.net.URI; import java.nio.file.DirectoryStream; diff --git a/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestHandleLimitFS.java b/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestHandleLimitFS.java index 514ec1bfc0a..58fe9912b43 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestHandleLimitFS.java +++ b/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestHandleLimitFS.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 @@ -16,6 +14,7 @@ package org.apache.lucene.mockfile; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.mockfile; import java.io.Closeable; import java.io.IOException; diff --git a/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestHandleTrackingFS.java b/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestHandleTrackingFS.java index ecaf712161a..56813116567 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestHandleTrackingFS.java +++ b/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestHandleTrackingFS.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 @@ -16,6 +14,7 @@ package org.apache.lucene.mockfile; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.mockfile; import java.io.IOException; import java.io.InputStream; diff --git a/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestLeakFS.java b/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestLeakFS.java index 7f3d65f479c..a74d4a6b63d 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestLeakFS.java +++ b/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestLeakFS.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 @@ -16,6 +14,7 @@ package org.apache.lucene.mockfile; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.mockfile; import java.io.IOException; import java.io.InputStream; diff --git a/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestShuffleFS.java b/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestShuffleFS.java index b1ba0d8addd..5327d574224 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestShuffleFS.java +++ b/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestShuffleFS.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 @@ -16,6 +14,7 @@ package org.apache.lucene.mockfile; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.mockfile; import java.io.IOException; import java.net.URI; diff --git a/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestVerboseFS.java b/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestVerboseFS.java index 8b97055f0c0..bc0e75c73b5 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestVerboseFS.java +++ b/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestVerboseFS.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 @@ -16,6 +14,7 @@ package org.apache.lucene.mockfile; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.mockfile; import java.io.IOException; import java.io.OutputStream; diff --git a/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestWindowsFS.java b/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestWindowsFS.java index 333ff0086cf..72cbd04cfb3 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestWindowsFS.java +++ b/lucene/test-framework/src/test/org/apache/lucene/mockfile/TestWindowsFS.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 @@ -16,6 +14,7 @@ package org.apache.lucene.mockfile; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.mockfile; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/lucene/test-framework/src/test/org/apache/lucene/store/TestMockDirectoryWrapper.java b/lucene/test-framework/src/test/org/apache/lucene/store/TestMockDirectoryWrapper.java index fd30582fa5a..8a5573fe54b 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/store/TestMockDirectoryWrapper.java +++ b/lucene/test-framework/src/test/org/apache/lucene/store/TestMockDirectoryWrapper.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 @@ -16,6 +14,7 @@ package org.apache.lucene.store; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.store; import java.io.IOException; import java.nio.file.Path; diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/SorePoint.java b/lucene/test-framework/src/test/org/apache/lucene/util/SorePoint.java index 0b533c13864..41f9715dac5 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/SorePoint.java +++ b/lucene/test-framework/src/test/org/apache/lucene/util/SorePoint.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * 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.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; /** * A pointcut-like definition where we should trigger diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/SoreType.java b/lucene/test-framework/src/test/org/apache/lucene/util/SoreType.java index ef888f01431..4bb6fb8886a 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/SoreType.java +++ b/lucene/test-framework/src/test/org/apache/lucene/util/SoreType.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * 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.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; public enum SoreType { ASSUMPTION, diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/TestBeforeAfterOverrides.java b/lucene/test-framework/src/test/org/apache/lucene/util/TestBeforeAfterOverrides.java index 165057fd308..c1b892da037 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/TestBeforeAfterOverrides.java +++ b/lucene/test-framework/src/test/org/apache/lucene/util/TestBeforeAfterOverrides.java @@ -1,12 +1,3 @@ -package org.apache.lucene.util; - -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.JUnitCore; -import org.junit.runner.Result; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -23,6 +14,14 @@ import org.junit.runner.Result; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.JUnitCore; +import org.junit.runner.Result; public class TestBeforeAfterOverrides extends WithNestedTests { public TestBeforeAfterOverrides() { diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/TestCodecReported.java b/lucene/test-framework/src/test/org/apache/lucene/util/TestCodecReported.java index 869d6577463..a1f8f422813 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/TestCodecReported.java +++ b/lucene/test-framework/src/test/org/apache/lucene/util/TestCodecReported.java @@ -1,11 +1,3 @@ -package org.apache.lucene.util; - -import org.apache.lucene.codecs.Codec; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.JUnitCore; -import org.junit.runner.Result; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -22,6 +14,13 @@ import org.junit.runner.Result; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + +import org.apache.lucene.codecs.Codec; +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.JUnitCore; +import org.junit.runner.Result; public class TestCodecReported extends WithNestedTests { public TestCodecReported() { diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/TestExceptionInBeforeClassHooks.java b/lucene/test-framework/src/test/org/apache/lucene/util/TestExceptionInBeforeClassHooks.java index cb454be5cd4..bd99b4bea64 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/TestExceptionInBeforeClassHooks.java +++ b/lucene/test-framework/src/test/org/apache/lucene/util/TestExceptionInBeforeClassHooks.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * 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.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; import java.util.*; import java.util.regex.Matcher; diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/TestFailIfDirectoryNotClosed.java b/lucene/test-framework/src/test/org/apache/lucene/util/TestFailIfDirectoryNotClosed.java index 5014f369698..a367d4e6dc1 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/TestFailIfDirectoryNotClosed.java +++ b/lucene/test-framework/src/test/org/apache/lucene/util/TestFailIfDirectoryNotClosed.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * 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.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; import org.apache.lucene.store.Directory; import org.junit.Assert; diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/TestFailIfUnreferencedFiles.java b/lucene/test-framework/src/test/org/apache/lucene/util/TestFailIfUnreferencedFiles.java index 03b6f406920..891dcb03857 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/TestFailIfUnreferencedFiles.java +++ b/lucene/test-framework/src/test/org/apache/lucene/util/TestFailIfUnreferencedFiles.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * 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.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; import java.util.Collections; diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/TestGroupFiltering.java b/lucene/test-framework/src/test/org/apache/lucene/util/TestGroupFiltering.java index a5ab4462597..1e519b75d67 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/TestGroupFiltering.java +++ b/lucene/test-framework/src/test/org/apache/lucene/util/TestGroupFiltering.java @@ -1,14 +1,3 @@ -package org.apache.lucene.util; - -import java.lang.annotation.Documented; -import java.lang.annotation.Inherited; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -import org.apache.lucene.util.LuceneTestCase; - -import com.carrotsearch.randomizedtesting.annotations.TestGroup; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -25,6 +14,16 @@ import com.carrotsearch.randomizedtesting.annotations.TestGroup; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + +import java.lang.annotation.Documented; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +import org.apache.lucene.util.LuceneTestCase; + +import com.carrotsearch.randomizedtesting.annotations.TestGroup; public class TestGroupFiltering extends LuceneTestCase { @Documented diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/TestJUnitRuleOrder.java b/lucene/test-framework/src/test/org/apache/lucene/util/TestJUnitRuleOrder.java index e4888fd5cd6..92494798020 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/TestJUnitRuleOrder.java +++ b/lucene/test-framework/src/test/org/apache/lucene/util/TestJUnitRuleOrder.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * 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.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; import java.util.Arrays; import java.util.Stack; diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/TestMaxFailuresRule.java b/lucene/test-framework/src/test/org/apache/lucene/util/TestMaxFailuresRule.java index f1fd2de746e..216c35c5abd 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/TestMaxFailuresRule.java +++ b/lucene/test-framework/src/test/org/apache/lucene/util/TestMaxFailuresRule.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * 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.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; import java.util.concurrent.CountDownLatch; diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/TestRamUsageTesterOnWildAnimals.java b/lucene/test-framework/src/test/org/apache/lucene/util/TestRamUsageTesterOnWildAnimals.java index cf45cb9f5f7..a2a5cee3d6c 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/TestRamUsageTesterOnWildAnimals.java +++ b/lucene/test-framework/src/test/org/apache/lucene/util/TestRamUsageTesterOnWildAnimals.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * 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.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; import org.junit.Assert; diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/TestReproduceMessage.java b/lucene/test-framework/src/test/org/apache/lucene/util/TestReproduceMessage.java index 50fee7c0f35..952d8bb6d7f 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/TestReproduceMessage.java +++ b/lucene/test-framework/src/test/org/apache/lucene/util/TestReproduceMessage.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * 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.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; import java.util.Arrays; diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/TestReproduceMessageWithRepeated.java b/lucene/test-framework/src/test/org/apache/lucene/util/TestReproduceMessageWithRepeated.java index 5b845c6aaf0..9e03d076e00 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/TestReproduceMessageWithRepeated.java +++ b/lucene/test-framework/src/test/org/apache/lucene/util/TestReproduceMessageWithRepeated.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * 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.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; import org.junit.Assert; import org.junit.Test; diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/TestRunWithRestrictedPermissions.java b/lucene/test-framework/src/test/org/apache/lucene/util/TestRunWithRestrictedPermissions.java index 208b5c8d909..2aa678b4630 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/TestRunWithRestrictedPermissions.java +++ b/lucene/test-framework/src/test/org/apache/lucene/util/TestRunWithRestrictedPermissions.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * 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.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; import java.io.IOException; import java.nio.file.Files; diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/TestSeedFromUncaught.java b/lucene/test-framework/src/test/org/apache/lucene/util/TestSeedFromUncaught.java index fecffd9767d..5dd92c14b57 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/TestSeedFromUncaught.java +++ b/lucene/test-framework/src/test/org/apache/lucene/util/TestSeedFromUncaught.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * 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.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; import org.apache.lucene.util.LuceneTestCase; import org.junit.Assert; diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/TestSetupTeardownChaining.java b/lucene/test-framework/src/test/org/apache/lucene/util/TestSetupTeardownChaining.java index 72d6695bcd4..6078015dc85 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/TestSetupTeardownChaining.java +++ b/lucene/test-framework/src/test/org/apache/lucene/util/TestSetupTeardownChaining.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * 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.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; import org.apache.lucene.util.LuceneTestCase; import org.junit.Assert; diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/TestWorstCaseTestBehavior.java b/lucene/test-framework/src/test/org/apache/lucene/util/TestWorstCaseTestBehavior.java index deb44cfe53d..427b5013dd0 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/TestWorstCaseTestBehavior.java +++ b/lucene/test-framework/src/test/org/apache/lucene/util/TestWorstCaseTestBehavior.java @@ -1,11 +1,3 @@ -package org.apache.lucene.util; - -import org.apache.lucene.util.LuceneTestCase; -import org.junit.Ignore; - -import com.carrotsearch.randomizedtesting.RandomizedTest; -import com.carrotsearch.randomizedtesting.annotations.Timeout; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -22,6 +14,13 @@ import com.carrotsearch.randomizedtesting.annotations.Timeout; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; + +import org.apache.lucene.util.LuceneTestCase; +import org.junit.Ignore; + +import com.carrotsearch.randomizedtesting.RandomizedTest; +import com.carrotsearch.randomizedtesting.annotations.Timeout; public class TestWorstCaseTestBehavior extends LuceneTestCase { @Ignore diff --git a/lucene/test-framework/src/test/org/apache/lucene/util/WithNestedTests.java b/lucene/test-framework/src/test/org/apache/lucene/util/WithNestedTests.java index 55285218adc..523b18dc04d 100644 --- a/lucene/test-framework/src/test/org/apache/lucene/util/WithNestedTests.java +++ b/lucene/test-framework/src/test/org/apache/lucene/util/WithNestedTests.java @@ -1,5 +1,3 @@ -package org.apache.lucene.util; - /* * 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.lucene.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.util; import java.io.ByteArrayOutputStream; import java.io.PrintStream; diff --git a/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java b/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java index b833bb073b7..4e642ee1212 100644 --- a/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java +++ b/lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.dependencies; - /* * 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.lucene.dependencies; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.dependencies; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; diff --git a/lucene/tools/src/java/org/apache/lucene/dependencies/InterpolatedProperties.java b/lucene/tools/src/java/org/apache/lucene/dependencies/InterpolatedProperties.java index 6b9400db62a..159a80353c5 100644 --- a/lucene/tools/src/java/org/apache/lucene/dependencies/InterpolatedProperties.java +++ b/lucene/tools/src/java/org/apache/lucene/dependencies/InterpolatedProperties.java @@ -1,5 +1,3 @@ -package org.apache.lucene.dependencies; - /* * 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.lucene.dependencies; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.dependencies; import java.io.IOException; import java.io.InputStream; diff --git a/lucene/tools/src/java/org/apache/lucene/validation/LibVersionsCheckTask.java b/lucene/tools/src/java/org/apache/lucene/validation/LibVersionsCheckTask.java index 0fa68cc899b..63aeb32fa4a 100644 --- a/lucene/tools/src/java/org/apache/lucene/validation/LibVersionsCheckTask.java +++ b/lucene/tools/src/java/org/apache/lucene/validation/LibVersionsCheckTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.validation; - /* * 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.lucene.validation; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.validation; import org.apache.ivy.Ivy; import org.apache.ivy.core.LogOptions; diff --git a/lucene/tools/src/java/org/apache/lucene/validation/LicenseCheckTask.java b/lucene/tools/src/java/org/apache/lucene/validation/LicenseCheckTask.java index b1bdab7a0f2..e26df804320 100644 --- a/lucene/tools/src/java/org/apache/lucene/validation/LicenseCheckTask.java +++ b/lucene/tools/src/java/org/apache/lucene/validation/LicenseCheckTask.java @@ -1,5 +1,3 @@ -package org.apache.lucene.validation; - /* * 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.lucene.validation; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.validation; import java.io.File; import java.io.FileInputStream; diff --git a/lucene/tools/src/java/org/apache/lucene/validation/LicenseType.java b/lucene/tools/src/java/org/apache/lucene/validation/LicenseType.java index d0ae46dca7c..23593829c0e 100644 --- a/lucene/tools/src/java/org/apache/lucene/validation/LicenseType.java +++ b/lucene/tools/src/java/org/apache/lucene/validation/LicenseType.java @@ -1,6 +1,3 @@ -package org.apache.lucene.validation; - - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +14,8 @@ package org.apache.lucene.validation; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.lucene.validation; + /** * A list of accepted licenses. See also http://www.apache.org/legal/3party.html diff --git a/lucene/tools/src/java/org/apache/lucene/validation/ivyde/IvyNodeElement.java b/lucene/tools/src/java/org/apache/lucene/validation/ivyde/IvyNodeElement.java index 63ddc208521..287527e2e3c 100644 --- a/lucene/tools/src/java/org/apache/lucene/validation/ivyde/IvyNodeElement.java +++ b/lucene/tools/src/java/org/apache/lucene/validation/ivyde/IvyNodeElement.java @@ -1,22 +1,20 @@ -package org.apache.lucene.validation.ivyde; - /* - * 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 + * 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. + * 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.validation.ivyde; import org.apache.ivy.core.module.id.ModuleRevisionId; diff --git a/lucene/tools/src/java/org/apache/lucene/validation/ivyde/IvyNodeElementAdapter.java b/lucene/tools/src/java/org/apache/lucene/validation/ivyde/IvyNodeElementAdapter.java index f583d135191..c754dd4013f 100644 --- a/lucene/tools/src/java/org/apache/lucene/validation/ivyde/IvyNodeElementAdapter.java +++ b/lucene/tools/src/java/org/apache/lucene/validation/ivyde/IvyNodeElementAdapter.java @@ -1,22 +1,20 @@ -package org.apache.lucene.validation.ivyde; - /* - * 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 + * 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. + * 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.validation.ivyde; import org.apache.ivy.core.module.id.ModuleId; import org.apache.ivy.core.module.id.ModuleRevisionId; diff --git a/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java b/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java index 7fa5cdb9769..4cfb2874aa4 100644 --- a/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java +++ b/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java @@ -1,5 +1,3 @@ -package org.apache.solr.schema; - /* * 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.schema; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.schema; import java.io.IOException; import java.io.InputStream; diff --git a/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestFoldingMultitermExtrasQuery.java b/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestFoldingMultitermExtrasQuery.java index bb0845eb5a4..b7e742bacd9 100644 --- a/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestFoldingMultitermExtrasQuery.java +++ b/solr/contrib/analysis-extras/src/test/org/apache/solr/analysis/TestFoldingMultitermExtrasQuery.java @@ -1,5 +1,3 @@ -package org.apache.solr.analysis; - /* * 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.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.analysis; import java.io.File; diff --git a/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java b/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java index 1d51fc0a8e1..e25e440639d 100644 --- a/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java +++ b/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationField.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; import java.io.File; diff --git a/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldDocValues.java b/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldDocValues.java index 00baad1face..bdddc986508 100644 --- a/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldDocValues.java +++ b/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldDocValues.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; import java.io.File; diff --git a/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldOptions.java b/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldOptions.java index f1fcf536a46..7a5dca74e49 100644 --- a/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldOptions.java +++ b/solr/contrib/analysis-extras/src/test/org/apache/solr/schema/TestICUCollationFieldOptions.java @@ -1,5 +1,3 @@ -package org.apache.solr.schema; - /* * 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.schema; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.schema; import org.apache.commons.io.FileUtils; import org.apache.solr.SolrTestCaseJ4; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/BasicAccumulator.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/BasicAccumulator.java index c78de1c4c97..53037c1ad57 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/BasicAccumulator.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/BasicAccumulator.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.accumulator; import java.io.IOException; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/FacetingAccumulator.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/FacetingAccumulator.java index 78b9f5c1311..7cb0c144ea2 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/FacetingAccumulator.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/FacetingAccumulator.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.accumulator; import java.io.IOException; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/ValueAccumulator.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/ValueAccumulator.java index 8ed37aa64e0..489d3de1320 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/ValueAccumulator.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/ValueAccumulator.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.accumulator; import java.io.IOException; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/facet/FacetValueAccumulator.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/facet/FacetValueAccumulator.java index a8b49fdf495..1b6fbb71d1b 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/facet/FacetValueAccumulator.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/facet/FacetValueAccumulator.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.accumulator.facet; import java.io.IOException; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/facet/FieldFacetAccumulator.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/facet/FieldFacetAccumulator.java index e17450a6862..2bcaa333aff 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/facet/FieldFacetAccumulator.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/facet/FieldFacetAccumulator.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.accumulator.facet; import java.io.IOException; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/facet/QueryFacetAccumulator.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/facet/QueryFacetAccumulator.java index 7e4f9066c6c..8b92ba096e5 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/facet/QueryFacetAccumulator.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/facet/QueryFacetAccumulator.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.accumulator.facet; import java.io.IOException; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/facet/RangeFacetAccumulator.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/facet/RangeFacetAccumulator.java index c3b6f218ea1..59cf4288a96 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/facet/RangeFacetAccumulator.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/facet/RangeFacetAccumulator.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.accumulator.facet; import java.io.IOException; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/facet/package-info.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/facet/package-info.java index 3daf103f1b5..3f19c07ad83 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/facet/package-info.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/facet/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Accumulators for accumulating over differnt types of facets diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/package-info.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/package-info.java index 0abe00a1ff9..8af50648762 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/package-info.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Accumulators accumulate values over different types of strucuture (eg result, facet, etc..) */ diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/expression/BaseExpression.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/expression/BaseExpression.java index 1455cbcf320..2f0326b6a59 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/expression/BaseExpression.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/expression/BaseExpression.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.expression; import java.util.Date; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/expression/DualDelegateExpression.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/expression/DualDelegateExpression.java index f8579bf2d61..f906b47b6c4 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/expression/DualDelegateExpression.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/expression/DualDelegateExpression.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.expression; /** diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/expression/Expression.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/expression/Expression.java index add097682e7..4c9bd585d95 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/expression/Expression.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/expression/Expression.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.expression; import java.util.Comparator; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/expression/ExpressionFactory.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/expression/ExpressionFactory.java index 29f94b04d94..8ad4070d180 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/expression/ExpressionFactory.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/expression/ExpressionFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.expression; import java.text.ParseException; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/expression/MultiDelegateExpression.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/expression/MultiDelegateExpression.java index bb979dfac24..4ea66fa13cc 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/expression/MultiDelegateExpression.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/expression/MultiDelegateExpression.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.expression; import java.text.ParseException; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/expression/SingleDelegateExpression.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/expression/SingleDelegateExpression.java index c6ab60ed3d2..8d94eceaa6a 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/expression/SingleDelegateExpression.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/expression/SingleDelegateExpression.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.expression; import java.util.Date; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/expression/package-info.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/expression/package-info.java index 8c6f70ece86..b279d3a0b99 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/expression/package-info.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/expression/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Expressions map either zero, one, two or many inputs to a single value. They can be defined recursively to compute complex math. */ diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/plugin/AnalyticsStatisticsCollector.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/plugin/AnalyticsStatisticsCollector.java index a57c546ff43..cf5bd430925 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/plugin/AnalyticsStatisticsCollector.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/plugin/AnalyticsStatisticsCollector.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.plugin; import java.util.concurrent.atomic.AtomicLong; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/plugin/package-info.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/plugin/package-info.java index 3496b12216d..ac77d70f678 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/plugin/package-info.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/plugin/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * MBean plugins for stats collection */ diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/AbstractFieldFacetRequest.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/AbstractFieldFacetRequest.java index 6f85cf0dba3..8121f56cb03 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/AbstractFieldFacetRequest.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/AbstractFieldFacetRequest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.request; import org.apache.solr.schema.SchemaField; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/AnalyticsContentHandler.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/AnalyticsContentHandler.java index db21094b219..31b0576a7d2 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/AnalyticsContentHandler.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/AnalyticsContentHandler.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.request; import java.util.ArrayList; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/AnalyticsRequest.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/AnalyticsRequest.java index 2f249994bd1..d147e6e9c2e 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/AnalyticsRequest.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/AnalyticsRequest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.request; import java.util.ArrayList; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/AnalyticsRequestFactory.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/AnalyticsRequestFactory.java index 3e2e994e062..3773ff6bae1 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/AnalyticsRequestFactory.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/AnalyticsRequestFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.request; import java.util.ArrayList; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/AnalyticsStats.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/AnalyticsStats.java index d4818478bee..a9cdef908a1 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/AnalyticsStats.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/AnalyticsStats.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.request; import java.io.IOException; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/ExpressionRequest.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/ExpressionRequest.java index 1549cdfb8a6..a833c80c971 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/ExpressionRequest.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/ExpressionRequest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.request; import org.apache.solr.analytics.expression.Expression; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/FacetRequest.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/FacetRequest.java index 6cca99d6f3d..936af7244c6 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/FacetRequest.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/FacetRequest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.request; public interface FacetRequest { diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/FieldFacetRequest.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/FieldFacetRequest.java index 7884476d577..67d93da4e71 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/FieldFacetRequest.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/FieldFacetRequest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.request; import org.apache.solr.analytics.util.AnalyticsParams; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/QueryFacetRequest.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/QueryFacetRequest.java index b02740cc70c..fbe34db523f 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/QueryFacetRequest.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/QueryFacetRequest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.request; import java.util.ArrayList; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/RangeFacetRequest.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/RangeFacetRequest.java index 8c70b98fa01..ec9cf6b39ae 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/RangeFacetRequest.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/RangeFacetRequest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.request; import java.util.Arrays; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/package-info.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/package-info.java index de2feb3816f..c28836b64ce 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/package-info.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Request objects for creating Analytics requests */ diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/AbstractDelegatingStatsCollector.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/AbstractDelegatingStatsCollector.java index 07b6d26ff06..45dfa00d826 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/AbstractDelegatingStatsCollector.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/AbstractDelegatingStatsCollector.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.statistics; import java.io.IOException; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/MedianStatsCollector.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/MedianStatsCollector.java index 80955367f60..c91840b3026 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/MedianStatsCollector.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/MedianStatsCollector.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.statistics; import java.util.ArrayList; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/MinMaxStatsCollector.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/MinMaxStatsCollector.java index f1c3e4a679b..7e3bde10a71 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/MinMaxStatsCollector.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/MinMaxStatsCollector.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.statistics; import java.io.IOException; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/NumericStatsCollector.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/NumericStatsCollector.java index ef3de5dc02b..6a64eeb3e2c 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/NumericStatsCollector.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/NumericStatsCollector.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.statistics; import java.util.Set; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/PercentileStatsCollector.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/PercentileStatsCollector.java index 2ddfb99e081..5f63ef9ed6f 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/PercentileStatsCollector.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/PercentileStatsCollector.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.statistics; import java.util.ArrayList; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/StatsCollector.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/StatsCollector.java index cfeaa86cb82..d9a464001db 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/StatsCollector.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/StatsCollector.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.statistics; import java.io.IOException; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/StatsCollectorSupplierFactory.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/StatsCollectorSupplierFactory.java index 49d243a1bed..bee7431a69d 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/StatsCollectorSupplierFactory.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/StatsCollectorSupplierFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.statistics; import java.lang.invoke.MethodHandles; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/UniqueStatsCollector.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/UniqueStatsCollector.java index a06a09345ca..d4d537c2b27 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/UniqueStatsCollector.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/UniqueStatsCollector.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.statistics; import java.util.HashSet; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/package-info.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/package-info.java index 90fa12da88f..31b0e04eedd 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/package-info.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Statistics collectors reduce a list of Objects to a single value. Most implementations reduce a list to a statistic on that list. */ diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/AnalyticsParams.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/AnalyticsParams.java index d7f220a22b8..b9da1cf8aec 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/AnalyticsParams.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/AnalyticsParams.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.util; import java.util.Collections; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/AnalyticsParsers.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/AnalyticsParsers.java index f0b73f2d3ee..53105bdd795 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/AnalyticsParsers.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/AnalyticsParsers.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.util; import java.io.IOException; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/MedianCalculator.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/MedianCalculator.java index 48575977939..52935e90dc0 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/MedianCalculator.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/MedianCalculator.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.util; import java.util.List; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/PercentileCalculator.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/PercentileCalculator.java index 714575ef269..4ae5cc0b2d6 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/PercentileCalculator.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/PercentileCalculator.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.util; import java.util.ArrayList; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/RangeEndpointCalculator.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/RangeEndpointCalculator.java index b7d02440d4c..6d899e0b9cd 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/RangeEndpointCalculator.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/RangeEndpointCalculator.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.util; import java.util.ArrayList; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/package-info.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/package-info.java index a5676f19590..89b60595db9 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/package-info.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Utilities used by analytics component */ diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/AbsoluteValueDoubleFunction.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/AbsoluteValueDoubleFunction.java index f42924875d6..62c99a78758 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/AbsoluteValueDoubleFunction.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/AbsoluteValueDoubleFunction.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.util.valuesource; import org.apache.lucene.queries.function.FunctionValues; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/AddDoubleFunction.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/AddDoubleFunction.java index edf98e477de..1a8a2546dcf 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/AddDoubleFunction.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/AddDoubleFunction.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.util.valuesource; import org.apache.lucene.queries.function.FunctionValues; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/ConcatStringFunction.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/ConcatStringFunction.java index 97537a7619e..3620c47a44a 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/ConcatStringFunction.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/ConcatStringFunction.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.util.valuesource; import org.apache.lucene.queries.function.FunctionValues; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/ConstDateSource.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/ConstDateSource.java index 19acfee9970..dc2e02ca037 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/ConstDateSource.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/ConstDateSource.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.util.valuesource; import java.io.IOException; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/ConstDoubleSource.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/ConstDoubleSource.java index 4feb4523ed8..80e8ed183cf 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/ConstDoubleSource.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/ConstDoubleSource.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.util.valuesource; import java.io.IOException; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/ConstStringSource.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/ConstStringSource.java index c2c9af78e7f..52bdf525a55 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/ConstStringSource.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/ConstStringSource.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.util.valuesource; import org.apache.lucene.queries.function.valuesource.LiteralValueSource; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/DateFieldSource.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/DateFieldSource.java index f072417569d..631aca0b63e 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/DateFieldSource.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/DateFieldSource.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.util.valuesource; import java.io.IOException; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/DateMathFunction.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/DateMathFunction.java index f2d4c4a858a..2bf40f3296f 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/DateMathFunction.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/DateMathFunction.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.util.valuesource; import java.text.ParseException; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/DivDoubleFunction.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/DivDoubleFunction.java index f029d79a351..5e43901cdd5 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/DivDoubleFunction.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/DivDoubleFunction.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.util.valuesource; import org.apache.lucene.queries.function.FunctionValues; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/DualDoubleFunction.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/DualDoubleFunction.java index 4bf6e612eba..96058aaa8b1 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/DualDoubleFunction.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/DualDoubleFunction.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.util.valuesource; import java.io.IOException; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/FilterFieldSource.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/FilterFieldSource.java index 272dfc476e5..8eb35d144c3 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/FilterFieldSource.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/FilterFieldSource.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.util.valuesource; import java.io.IOException; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/LogDoubleFunction.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/LogDoubleFunction.java index c4729a31ad8..63906de4be7 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/LogDoubleFunction.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/LogDoubleFunction.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.util.valuesource; import org.apache.lucene.queries.function.FunctionValues; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/MultiDateFunction.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/MultiDateFunction.java index 6a954c130e5..3daa0ea7667 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/MultiDateFunction.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/MultiDateFunction.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.util.valuesource; import java.io.IOException; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/MultiDoubleFunction.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/MultiDoubleFunction.java index a7e9932c784..ded716c0947 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/MultiDoubleFunction.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/MultiDoubleFunction.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.util.valuesource; import java.io.IOException; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/MultiStringFunction.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/MultiStringFunction.java index a9f1867b4ba..1d9c67def5e 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/MultiStringFunction.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/MultiStringFunction.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.util.valuesource; import java.io.IOException; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/MultiplyDoubleFunction.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/MultiplyDoubleFunction.java index 62c50b5a2c9..1624ae95b28 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/MultiplyDoubleFunction.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/MultiplyDoubleFunction.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.util.valuesource; import org.apache.lucene.queries.function.FunctionValues; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/NegateDoubleFunction.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/NegateDoubleFunction.java index 4bff8d0845e..42972610669 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/NegateDoubleFunction.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/NegateDoubleFunction.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.util.valuesource; import org.apache.lucene.queries.function.FunctionValues; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/PowDoubleFunction.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/PowDoubleFunction.java index 1b4348b0118..757e31bae00 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/PowDoubleFunction.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/PowDoubleFunction.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.util.valuesource; import org.apache.lucene.queries.function.FunctionValues; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/ReverseStringFunction.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/ReverseStringFunction.java index 568f94e1821..68a18d482c9 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/ReverseStringFunction.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/ReverseStringFunction.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.util.valuesource; import org.apache.commons.lang.StringUtils; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/SingleDoubleFunction.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/SingleDoubleFunction.java index e150265325c..967f01406cc 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/SingleDoubleFunction.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/SingleDoubleFunction.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.util.valuesource; import java.io.IOException; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/SingleStringFunction.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/SingleStringFunction.java index 5607291737d..b6a79f0039e 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/SingleStringFunction.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/SingleStringFunction.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.util.valuesource; import java.io.IOException; diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/package-info.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/package-info.java index 72a23d28c08..c2d5b958a73 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/package-info.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * ValueSource function/sources used by analytics component */ diff --git a/solr/contrib/analytics/src/java/org/apache/solr/handler/component/AnalyticsComponent.java b/solr/contrib/analytics/src/java/org/apache/solr/handler/component/AnalyticsComponent.java index 38e73e2262c..f33b6c7a6dc 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/handler/component/AnalyticsComponent.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/handler/component/AnalyticsComponent.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.component; import java.io.IOException; diff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/AbstractAnalyticsStatsTest.java b/solr/contrib/analytics/src/test/org/apache/solr/analytics/AbstractAnalyticsStatsTest.java index 0066e45ea91..881822cf812 100644 --- a/solr/contrib/analytics/src/test/org/apache/solr/analytics/AbstractAnalyticsStatsTest.java +++ b/solr/contrib/analytics/src/test/org/apache/solr/analytics/AbstractAnalyticsStatsTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics; import java.io.ByteArrayInputStream; diff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/NoFacetTest.java b/solr/contrib/analytics/src/test/org/apache/solr/analytics/NoFacetTest.java index f217150c22b..ae935fbd43b 100644 --- a/solr/contrib/analytics/src/test/org/apache/solr/analytics/NoFacetTest.java +++ b/solr/contrib/analytics/src/test/org/apache/solr/analytics/NoFacetTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics; diff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/expression/ExpressionTest.java b/solr/contrib/analytics/src/test/org/apache/solr/analytics/expression/ExpressionTest.java index 737f137218f..25193588f6a 100644 --- a/solr/contrib/analytics/src/test/org/apache/solr/analytics/expression/ExpressionTest.java +++ b/solr/contrib/analytics/src/test/org/apache/solr/analytics/expression/ExpressionTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.expression; import com.google.common.collect.ObjectArrays; diff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/facet/AbstractAnalyticsFacetTest.java b/solr/contrib/analytics/src/test/org/apache/solr/analytics/facet/AbstractAnalyticsFacetTest.java index 0a7a5ded379..dab68a34ad7 100644 --- a/solr/contrib/analytics/src/test/org/apache/solr/analytics/facet/AbstractAnalyticsFacetTest.java +++ b/solr/contrib/analytics/src/test/org/apache/solr/analytics/facet/AbstractAnalyticsFacetTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.facet; import java.io.ByteArrayInputStream; diff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/facet/FieldFacetExtrasTest.java b/solr/contrib/analytics/src/test/org/apache/solr/analytics/facet/FieldFacetExtrasTest.java index 09e63fbc43e..1e8f4f974ce 100644 --- a/solr/contrib/analytics/src/test/org/apache/solr/analytics/facet/FieldFacetExtrasTest.java +++ b/solr/contrib/analytics/src/test/org/apache/solr/analytics/facet/FieldFacetExtrasTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.facet; diff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/facet/FieldFacetTest.java b/solr/contrib/analytics/src/test/org/apache/solr/analytics/facet/FieldFacetTest.java index 2eab53a2423..984398c6a89 100644 --- a/solr/contrib/analytics/src/test/org/apache/solr/analytics/facet/FieldFacetTest.java +++ b/solr/contrib/analytics/src/test/org/apache/solr/analytics/facet/FieldFacetTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.facet; import java.util.ArrayList; diff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/facet/QueryFacetTest.java b/solr/contrib/analytics/src/test/org/apache/solr/analytics/facet/QueryFacetTest.java index 8c5787d1932..f62a82bdcb0 100644 --- a/solr/contrib/analytics/src/test/org/apache/solr/analytics/facet/QueryFacetTest.java +++ b/solr/contrib/analytics/src/test/org/apache/solr/analytics/facet/QueryFacetTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.facet; diff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/facet/RangeFacetTest.java b/solr/contrib/analytics/src/test/org/apache/solr/analytics/facet/RangeFacetTest.java index c6e7494875d..cda820219b6 100644 --- a/solr/contrib/analytics/src/test/org/apache/solr/analytics/facet/RangeFacetTest.java +++ b/solr/contrib/analytics/src/test/org/apache/solr/analytics/facet/RangeFacetTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.facet; diff --git a/solr/contrib/analytics/src/test/org/apache/solr/analytics/util/valuesource/FunctionTest.java b/solr/contrib/analytics/src/test/org/apache/solr/analytics/util/valuesource/FunctionTest.java index 6a91401843f..5981cc0d0d7 100644 --- a/solr/contrib/analytics/src/test/org/apache/solr/analytics/util/valuesource/FunctionTest.java +++ b/solr/contrib/analytics/src/test/org/apache/solr/analytics/util/valuesource/FunctionTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analytics.util.valuesource; diff --git a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/ClusteringComponent.java b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/ClusteringComponent.java index 1dd8cf9285d..42a2de98ae8 100644 --- a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/ClusteringComponent.java +++ b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/ClusteringComponent.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.clustering; - /* * 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.handler.clustering; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.clustering; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/ClusteringEngine.java b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/ClusteringEngine.java index ee521998cc2..7b522ac675b 100644 --- a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/ClusteringEngine.java +++ b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/ClusteringEngine.java @@ -1,4 +1,3 @@ -package org.apache.solr.handler.clustering; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.solr.handler.clustering; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.clustering; import org.apache.solr.common.util.NamedList; import org.apache.solr.core.SolrCore; diff --git a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/ClusteringParams.java b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/ClusteringParams.java index fc1c3c67d4d..66e5c546c03 100644 --- a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/ClusteringParams.java +++ b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/ClusteringParams.java @@ -1,4 +1,3 @@ -package org.apache.solr.handler.clustering; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.handler.clustering; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.handler.clustering; /** * @lucene.experimental */ diff --git a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/DocumentClusteringEngine.java b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/DocumentClusteringEngine.java index d56ab7b48df..8196034bebc 100644 --- a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/DocumentClusteringEngine.java +++ b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/DocumentClusteringEngine.java @@ -1,4 +1,3 @@ -package org.apache.solr.handler.clustering; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.handler.clustering; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.handler.clustering; import org.apache.solr.common.util.NamedList; import org.apache.solr.common.params.SolrParams; import org.apache.solr.search.DocSet; diff --git a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/SearchClusteringEngine.java b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/SearchClusteringEngine.java index 3fcae7ba2e4..8f0d0d719bf 100644 --- a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/SearchClusteringEngine.java +++ b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/SearchClusteringEngine.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.clustering; - /* * 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.handler.clustering; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.clustering; import java.util.Map; import java.util.Set; diff --git a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java index 0e32ac9cbc2..a8548eceb8c 100644 --- a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java +++ b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngine.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.clustering.carrot2; - /* * 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.handler.clustering.carrot2; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.clustering.carrot2; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotParams.java b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotParams.java index beebb91aab4..42ff8da8402 100644 --- a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotParams.java +++ b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/CarrotParams.java @@ -1,9 +1,3 @@ -package org.apache.solr.handler.clustering.carrot2; - -import java.util.Set; - -import com.google.common.collect.ImmutableSet; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -20,7 +14,11 @@ import com.google.common.collect.ImmutableSet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.clustering.carrot2; +import java.util.Set; + +import com.google.common.collect.ImmutableSet; /** * Carrot2 parameter mapping (recognized and mapped if passed via Solr configuration). diff --git a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2StemmerFactory.java b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2StemmerFactory.java index a79cfbf3cd9..5013e4267fd 100644 --- a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2StemmerFactory.java +++ b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2StemmerFactory.java @@ -1,7 +1,3 @@ -package org.apache.solr.handler.clustering.carrot2; - -import java.lang.invoke.MethodHandles; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import java.lang.invoke.MethodHandles; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.clustering.carrot2; + +import java.lang.invoke.MethodHandles; import java.nio.CharBuffer; import java.util.HashMap; diff --git a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2TokenizerFactory.java b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2TokenizerFactory.java index 116490f70b2..0ee153bd779 100644 --- a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2TokenizerFactory.java +++ b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2TokenizerFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.clustering.carrot2; - /* * 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.handler.clustering.carrot2; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.clustering.carrot2; import java.io.IOException; import java.io.Reader; diff --git a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/SolrResourceLocator.java b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/SolrResourceLocator.java index 16589576d3b..b0783022d7d 100644 --- a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/SolrResourceLocator.java +++ b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/SolrResourceLocator.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.clustering.carrot2; import java.io.ByteArrayInputStream; diff --git a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/SolrStopwordsCarrot2LexicalDataFactory.java b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/SolrStopwordsCarrot2LexicalDataFactory.java index 744e8b3a927..85402ebd35d 100644 --- a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/SolrStopwordsCarrot2LexicalDataFactory.java +++ b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/SolrStopwordsCarrot2LexicalDataFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.clustering.carrot2; - /* * 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.handler.clustering.carrot2; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.clustering.carrot2; import java.util.Collection; import java.util.Set; diff --git a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/package-info.java b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/package-info.java index 6d0d49b7d64..58ab0fd6576 100644 --- a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/package-info.java +++ b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * {@link org.apache.solr.handler.clustering.carrot2.CarrotClusteringEngine} and related classes for use in the {@link org.apache.solr.handler.clustering.ClusteringComponent}. */ diff --git a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/package-info.java b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/package-info.java index 25cca338821..41333bad12c 100644 --- a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/package-info.java +++ b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * {@link org.apache.solr.handler.clustering.ClusteringComponent} and common APIs for specific implementations. diff --git a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/AbstractClusteringTestCase.java b/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/AbstractClusteringTestCase.java index 77de5f7cc9d..ca2f4248068 100644 --- a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/AbstractClusteringTestCase.java +++ b/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/AbstractClusteringTestCase.java @@ -1,4 +1,3 @@ -package org.apache.solr.handler.clustering; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.handler.clustering; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.handler.clustering; import java.io.File; import java.util.Map; diff --git a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentTest.java b/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentTest.java index 4b53cdb0806..e8cf8309bb8 100644 --- a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentTest.java +++ b/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentTest.java @@ -1,4 +1,3 @@ -package org.apache.solr.handler.clustering; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.handler.clustering; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.handler.clustering; import org.apache.solr.common.params.CommonParams; import org.apache.solr.common.params.ModifiableSolrParams; import org.apache.solr.common.util.NamedList; diff --git a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/DistributedClusteringComponentTest.java b/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/DistributedClusteringComponentTest.java index 62b4b48c657..89d3ddf3ee6 100644 --- a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/DistributedClusteringComponentTest.java +++ b/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/DistributedClusteringComponentTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.clustering; - /* * 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.handler.clustering; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.clustering; import org.apache.solr.BaseDistributedSearchTestCase; import org.apache.solr.SolrTestCaseJ4.SuppressSSL; diff --git a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/MockDocumentClusteringEngine.java b/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/MockDocumentClusteringEngine.java index 5b8e7e602d8..dc982664065 100644 --- a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/MockDocumentClusteringEngine.java +++ b/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/MockDocumentClusteringEngine.java @@ -1,4 +1,3 @@ -package org.apache.solr.handler.clustering; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.solr.handler.clustering; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.clustering; import org.apache.solr.common.params.SolrParams; import org.apache.solr.common.util.NamedList; import org.apache.solr.search.DocSet; diff --git a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngineTest.java b/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngineTest.java index 3924d3a16fb..302247f39e7 100644 --- a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngineTest.java +++ b/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngineTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.clustering.carrot2; - /* * 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.handler.clustering.carrot2; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.clustering.carrot2; import java.io.IOException; import java.util.HashMap; diff --git a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/DuplicatingStemmerFactory.java b/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/DuplicatingStemmerFactory.java index baf208b33b5..f1f883d9545 100644 --- a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/DuplicatingStemmerFactory.java +++ b/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/DuplicatingStemmerFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.clustering.carrot2; - /* * 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.handler.clustering.carrot2; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.clustering.carrot2; import org.carrot2.core.LanguageCode; import org.carrot2.text.linguistic.IStemmer; diff --git a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/DuplicatingTokenizerFactory.java b/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/DuplicatingTokenizerFactory.java index 2d0e584f679..51820e7bbfc 100644 --- a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/DuplicatingTokenizerFactory.java +++ b/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/DuplicatingTokenizerFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.clustering.carrot2; - /* * 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.handler.clustering.carrot2; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.clustering.carrot2; import java.io.IOException; import java.io.Reader; diff --git a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/EchoClusteringAlgorithm.java b/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/EchoClusteringAlgorithm.java index 2b113b7bbfb..acaed3459f3 100644 --- a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/EchoClusteringAlgorithm.java +++ b/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/EchoClusteringAlgorithm.java @@ -1,4 +1,3 @@ -package org.apache.solr.handler.clustering.carrot2; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.solr.handler.clustering.carrot2; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.clustering.carrot2; import java.util.List; import org.carrot2.core.Cluster; diff --git a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/EchoStemsClusteringAlgorithm.java b/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/EchoStemsClusteringAlgorithm.java index 9827eb789d2..d2392a51352 100644 --- a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/EchoStemsClusteringAlgorithm.java +++ b/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/EchoStemsClusteringAlgorithm.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.clustering.carrot2; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.solr.handler.clustering.carrot2; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.clustering.carrot2; + import java.util.List; import org.carrot2.core.Cluster; diff --git a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/EchoTokensClusteringAlgorithm.java b/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/EchoTokensClusteringAlgorithm.java index f23004eebac..9ef04fba6e5 100644 --- a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/EchoTokensClusteringAlgorithm.java +++ b/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/EchoTokensClusteringAlgorithm.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.clustering.carrot2; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.solr.handler.clustering.carrot2; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.clustering.carrot2; + import java.util.List; import org.carrot2.core.Cluster; diff --git a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/LexicalResourcesCheckClusteringAlgorithm.java b/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/LexicalResourcesCheckClusteringAlgorithm.java index ebac6340692..00dd609ccc5 100644 --- a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/LexicalResourcesCheckClusteringAlgorithm.java +++ b/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/LexicalResourcesCheckClusteringAlgorithm.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.clustering.carrot2; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.solr.handler.clustering.carrot2; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.clustering.carrot2; + import java.util.List; import org.carrot2.core.Cluster; diff --git a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/MockClusteringAlgorithm.java b/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/MockClusteringAlgorithm.java index 483f0b13a39..8b335886708 100644 --- a/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/MockClusteringAlgorithm.java +++ b/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/MockClusteringAlgorithm.java @@ -1,4 +1,3 @@ -package org.apache.solr.handler.clustering.carrot2; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.solr.handler.clustering.carrot2; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.clustering.carrot2; import com.google.common.collect.Lists; import org.carrot2.core.*; import org.carrot2.core.attribute.AttributeNames; diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/CachePropertyUtil.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/CachePropertyUtil.java index ee9b1f17531..544761f8d88 100644 --- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/CachePropertyUtil.java +++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/CachePropertyUtil.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.dataimport; - /* * 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.handler.dataimport; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.dataimport; public class CachePropertyUtil { public static String getAttributeValueAsString(Context context, String attr) { diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/Context.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/Context.java index 56b821da7da..4d0cb3a683c 100644 --- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/Context.java +++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/Context.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.dataimport; import org.apache.solr.core.SolrCore; diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/ContextImpl.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/ContextImpl.java index 2e4f6a20edb..20a2aad456d 100644 --- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/ContextImpl.java +++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/ContextImpl.java @@ -1,4 +1,3 @@ -package org.apache.solr.handler.dataimport; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,8 +14,7 @@ package org.apache.solr.handler.dataimport; * See the License for the specific language governing permissions and * limitations under the License. */ - - +package org.apache.solr.handler.dataimport; import org.apache.solr.core.SolrCore; import org.apache.solr.handler.dataimport.config.Script; diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHCache.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHCache.java index 4b756d9c76b..7e72d4e0370 100644 --- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHCache.java +++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHCache.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.dataimport; - /* * 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.handler.dataimport; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.dataimport; import java.util.Iterator; import java.util.Map; diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHCacheSupport.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHCacheSupport.java index fde4cc58872..2efc386dba8 100644 --- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHCacheSupport.java +++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHCacheSupport.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.dataimport; - /* * 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.handler.dataimport; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.dataimport; import static org.apache.solr.handler.dataimport.DataImportHandlerException.wrapAndThrow; diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHLogLevels.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHLogLevels.java index e38c6583374..24732d1454f 100644 --- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHLogLevels.java +++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHLogLevels.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.dataimport; - /* * 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.handler.dataimport; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.dataimport; public enum DIHLogLevels { START_ENTITY, END_ENTITY, TRANSFORMED_ROW, ENTITY_META, PRE_TRANSFORMER_ROW, START_DOC, END_DOC, ENTITY_OUT, ROW_END, TRANSFORMER_EXCEPTION, ENTITY_EXCEPTION, DISABLE_LOGGING, ENABLE_LOGGING, NONE diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHProperties.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHProperties.java index 911322eef82..f51ef0713b6 100644 --- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHProperties.java +++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHProperties.java @@ -1,11 +1,9 @@ -package org.apache.solr.handler.dataimport; - /* * 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 combstract clapliance with + * (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 @@ -16,6 +14,7 @@ package org.apache.solr.handler.dataimport; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.dataimport; import java.util.Date; import java.util.Map; diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHWriter.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHWriter.java index 93e493aef05..bdb988d4836 100644 --- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHWriter.java +++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHWriter.java @@ -1,4 +1,3 @@ -package org.apache.solr.handler.dataimport; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.solr.handler.dataimport; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.dataimport; import java.util.Map; import java.util.Set; diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHWriterBase.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHWriterBase.java index a33a202aab7..43e92c37f79 100644 --- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHWriterBase.java +++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DIHWriterBase.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.dataimport; - /* * 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.handler.dataimport; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.dataimport; import java.util.HashSet; import java.util.Map; diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandlerException.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandlerException.java index b4ec65b02cf..7892c057292 100644 --- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandlerException.java +++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandlerException.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.dataimport; /** diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImporter.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImporter.java index 473c86f8fe1..3a1ae917488 100644 --- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImporter.java +++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImporter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.dataimport; import org.apache.solr.common.SolrException; diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataSource.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataSource.java index de8a3d7c3b2..e217ddd09c6 100644 --- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataSource.java +++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataSource.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.dataimport; import java.util.Properties; diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DateFormatEvaluator.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DateFormatEvaluator.java index 8406caccb86..30e16cef323 100644 --- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DateFormatEvaluator.java +++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DateFormatEvaluator.java @@ -1,3 +1,19 @@ +/* + * 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.handler.dataimport; import static org.apache.solr.handler.dataimport.DataImportHandlerException.SEVERE; @@ -19,23 +35,6 @@ import org.apache.solr.common.util.SuppressForbidden; import org.apache.solr.handler.dataimport.config.EntityField; import org.apache.solr.util.DateMathParser; -/* - * 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. - */ - /** *

Formats values using a given date format.

*

Pass three parameters: diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DateFormatTransformer.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DateFormatTransformer.java index e7b355208e8..f48cbea5458 100644 --- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DateFormatTransformer.java +++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DateFormatTransformer.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.dataimport; import java.lang.invoke.MethodHandles; diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DebugLogger.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DebugLogger.java index c0a94be2509..2fd93031073 100644 --- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DebugLogger.java +++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DebugLogger.java @@ -1,4 +1,3 @@ -package org.apache.solr.handler.dataimport; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.handler.dataimport; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.handler.dataimport; import org.apache.solr.common.util.NamedList; import java.io.PrintWriter; diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java index 3b6bff6112e..f9ccfb6fc0c 100644 --- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java +++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DocBuilder.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.dataimport; import org.apache.solr.common.SolrException; diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/NumberFormatTransformer.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/NumberFormatTransformer.java index 59147dde6a0..349b14eee30 100644 --- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/NumberFormatTransformer.java +++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/NumberFormatTransformer.java @@ -1,4 +1,3 @@ -package org.apache.solr.handler.dataimport; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.handler.dataimport; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.handler.dataimport; import java.text.NumberFormat; import java.text.ParseException; import java.text.ParsePosition; diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SimplePropertiesWriter.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SimplePropertiesWriter.java index 6ad4f826f97..92527bb46e0 100644 --- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SimplePropertiesWriter.java +++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SimplePropertiesWriter.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.dataimport; - /* * 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.handler.dataimport; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.dataimport; import java.io.File; import java.io.FileInputStream; diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrEntityProcessor.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrEntityProcessor.java index 035f975bde7..cece0cc9a4c 100644 --- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrEntityProcessor.java +++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrEntityProcessor.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.dataimport; - /* * 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.handler.dataimport; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.dataimport; import org.apache.http.client.HttpClient; import org.apache.solr.client.solrj.SolrClient; diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrQueryEscapingEvaluator.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrQueryEscapingEvaluator.java index 7f381f8b43a..aece0314b21 100644 --- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrQueryEscapingEvaluator.java +++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SolrQueryEscapingEvaluator.java @@ -1,11 +1,3 @@ -package org.apache.solr.handler.dataimport; - -import static org.apache.solr.handler.dataimport.DataImportHandlerException.SEVERE; - -import java.util.List; - -import org.apache.solr.client.solrj.util.ClientUtils; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -22,6 +14,13 @@ import org.apache.solr.client.solrj.util.ClientUtils; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.dataimport; + +import static org.apache.solr.handler.dataimport.DataImportHandlerException.SEVERE; + +import java.util.List; + +import org.apache.solr.client.solrj.util.ClientUtils; public class SolrQueryEscapingEvaluator extends Evaluator { @Override diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SortedMapBackedCache.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SortedMapBackedCache.java index aaf38d7033d..bb84ba90e89 100644 --- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SortedMapBackedCache.java +++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SortedMapBackedCache.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.dataimport; - /* * 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.handler.dataimport; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.dataimport; import java.util.ArrayList; import java.util.Collection; diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SqlEscapingEvaluator.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SqlEscapingEvaluator.java index 2ecd277110e..7f9c26eaa1c 100644 --- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SqlEscapingEvaluator.java +++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/SqlEscapingEvaluator.java @@ -1,9 +1,3 @@ -package org.apache.solr.handler.dataimport; - -import static org.apache.solr.handler.dataimport.DataImportHandlerException.SEVERE; - -import java.util.List; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -20,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.handler.dataimport; + +import static org.apache.solr.handler.dataimport.DataImportHandlerException.SEVERE; + +import java.util.List; /** *

Escapes values in SQL queries. It escapes the value of the given expression diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/UrlEvaluator.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/UrlEvaluator.java index 78f95234e25..d961e63a87b 100644 --- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/UrlEvaluator.java +++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/UrlEvaluator.java @@ -1,12 +1,3 @@ -package org.apache.solr.handler.dataimport; - -import static org.apache.solr.handler.dataimport.DataImportHandlerException.SEVERE; -import static org.apache.solr.handler.dataimport.DataImportHandlerException.wrapAndThrow; - -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; -import java.util.List; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -23,6 +14,14 @@ import java.util.List; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.dataimport; + +import static org.apache.solr.handler.dataimport.DataImportHandlerException.SEVERE; +import static org.apache.solr.handler.dataimport.DataImportHandlerException.wrapAndThrow; + +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.util.List; /** *

Escapes reserved characters in Solr queries

diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/Zipper.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/Zipper.java index 24f1889561f..59793bc0e76 100644 --- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/Zipper.java +++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/Zipper.java @@ -1,17 +1,3 @@ -package org.apache.solr.handler.dataimport; - -import java.lang.invoke.MethodHandles; -import java.util.Iterator; -import java.util.Map; - -import org.apache.solr.handler.dataimport.DIHCacheSupport.Relation; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.google.common.base.Supplier; -import com.google.common.collect.Iterators; -import com.google.common.collect.PeekingIterator; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -28,6 +14,19 @@ import com.google.common.collect.PeekingIterator; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.dataimport; + +import java.lang.invoke.MethodHandles; +import java.util.Iterator; +import java.util.Map; + +import org.apache.solr.handler.dataimport.DIHCacheSupport.Relation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.google.common.base.Supplier; +import com.google.common.collect.Iterators; +import com.google.common.collect.PeekingIterator; class Zipper { diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/DIHConfiguration.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/DIHConfiguration.java index 1073a6462d2..2b910425d19 100644 --- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/DIHConfiguration.java +++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/DIHConfiguration.java @@ -1,3 +1,19 @@ +/* + * 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.handler.dataimport.config; import java.lang.invoke.MethodHandles; @@ -16,23 +32,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3c.dom.Element; -/* - * 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. - */ - /** *

* Mapping for data-config.xml diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/Entity.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/Entity.java index e7c4f58270f..0d0ba4f5926 100644 --- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/Entity.java +++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/Entity.java @@ -1,20 +1,19 @@ /* * 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 - * + * 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. + * 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.handler.dataimport.config; import static org.apache.solr.handler.dataimport.DataImportHandlerException.SEVERE; @@ -29,7 +28,6 @@ import java.util.Set; import org.apache.solr.handler.dataimport.DataImportHandlerException; import org.apache.solr.handler.dataimport.DataImporter; -import org.apache.solr.schema.IndexSchema; import org.apache.solr.schema.SchemaField; import org.w3c.dom.Element; diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/EntityField.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/EntityField.java index adef4127eac..b61198d30e7 100644 --- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/EntityField.java +++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/EntityField.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.dataimport.config; import static org.apache.solr.handler.dataimport.DataImportHandlerException.SEVERE; diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/Field.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/Field.java index 43318113a33..7ff4832fc54 100644 --- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/Field.java +++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/Field.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.dataimport.config; import static org.apache.solr.handler.dataimport.DataImportHandlerException.SEVERE; diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/PropertyWriter.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/PropertyWriter.java index 7d3bd1851ac..6e91a1957fe 100644 --- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/PropertyWriter.java +++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/PropertyWriter.java @@ -1,8 +1,3 @@ -package org.apache.solr.handler.dataimport.config; - -import java.util.HashMap; -import java.util.Map; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -19,6 +14,10 @@ import java.util.Map; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.dataimport.config; + +import java.util.HashMap; +import java.util.Map; public class PropertyWriter { private final String type; diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/Script.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/Script.java index 5ec59a2d17e..9a4bc597049 100644 --- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/Script.java +++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/Script.java @@ -1,20 +1,19 @@ /* * 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 - * + * 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. + * 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.handler.dataimport.config; import org.w3c.dom.Element; diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/package-info.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/package-info.java index 50c6d4eab7c..e5caac0d23e 100644 --- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/package-info.java +++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Utility classes for parsing & modeling DIH configuration. */ diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/package-info.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/package-info.java index 4a69d23c569..79c52dcf224 100644 --- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/package-info.java +++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * {@link org.apache.solr.handler.dataimport.DataImportHandler} and related code. */ diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHCacheTestCase.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHCacheTestCase.java index 88e1ed890d4..b72f3797a48 100644 --- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHCacheTestCase.java +++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHCacheTestCase.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.dataimport; - /* * 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.handler.dataimport; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.dataimport; import java.io.Reader; import java.math.BigDecimal; diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHJdbcTestCase.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHJdbcTestCase.java index da2f0aa1cd3..1a0d888b68d 100644 --- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHJdbcTestCase.java +++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractDIHJdbcTestCase.java @@ -1,38 +1,34 @@ -package org.apache.solr.handler.dataimport; - /* * 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 - * + * 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. + * 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.handler.dataimport; import java.io.OutputStream; import java.sql.Connection; import java.sql.DriverManager; import java.sql.SQLException; import java.sql.Statement; -import java.util.Locale; import java.util.regex.Matcher; import java.util.regex.Pattern; import junit.framework.Assert; -import org.apache.derby.iapi.error.StandardException; import org.apache.solr.request.LocalSolrQueryRequest; import org.junit.After; import org.junit.AfterClass; -import org.junit.Assume; import org.junit.Before; import org.junit.BeforeClass; diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java index 1ab35e47210..06b89c3a4a6 100644 --- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java +++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java @@ -1,3 +1,19 @@ +/* + * 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.handler.dataimport; import junit.framework.Assert; @@ -25,23 +41,6 @@ import java.util.Locale; import java.util.Map; import java.util.Set; -/* - * 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 abstract class AbstractSqlEntityProcessorTestCase extends AbstractDIHJdbcTestCase { diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AddAColumnTransformer.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AddAColumnTransformer.java index 48fde00def7..5e665d4316a 100644 --- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AddAColumnTransformer.java +++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AddAColumnTransformer.java @@ -1,7 +1,3 @@ -package org.apache.solr.handler.dataimport; - -import java.util.Map; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import java.util.Map; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.dataimport; + +import java.util.Map; public class AddAColumnTransformer extends Transformer { @Override diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/DestroyCountCache.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/DestroyCountCache.java index 2cd6e8ae1d8..d14f43e1cc4 100644 --- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/DestroyCountCache.java +++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/DestroyCountCache.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.dataimport; - /* * 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.handler.dataimport; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.dataimport; import static org.hamcrest.CoreMatchers.nullValue; diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/MockSolrEntityProcessor.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/MockSolrEntityProcessor.java index 26ad13228bc..4ebca306ed8 100644 --- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/MockSolrEntityProcessor.java +++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/MockSolrEntityProcessor.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.dataimport; - /* * 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.handler.dataimport; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.dataimport; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.common.SolrDocument; diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestEphemeralCache.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestEphemeralCache.java index f4485ab385f..c9b5abe9258 100644 --- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestEphemeralCache.java +++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestEphemeralCache.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.dataimport; - /* * 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.handler.dataimport; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.dataimport; import java.math.BigDecimal; import java.util.ArrayList; diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestErrorHandling.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestErrorHandling.java index bbf66e310bb..74eaf9e20f6 100644 --- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestErrorHandling.java +++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestErrorHandling.java @@ -1,4 +1,3 @@ -package org.apache.solr.handler.dataimport; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.handler.dataimport; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.handler.dataimport; import java.io.Reader; import java.io.StringReader; import java.util.ArrayList; diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFileListEntityProcessor.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFileListEntityProcessor.java index aa37168a735..28f02784a71 100644 --- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFileListEntityProcessor.java +++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFileListEntityProcessor.java @@ -1,4 +1,3 @@ -package org.apache.solr.handler.dataimport; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.handler.dataimport; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.handler.dataimport; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.TestUtil; import org.apache.solr.common.util.SuppressForbidden; diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFileListWithLineEntityProcessor.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFileListWithLineEntityProcessor.java index 656bdaf0c68..c978a455792 100644 --- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFileListWithLineEntityProcessor.java +++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestFileListWithLineEntityProcessor.java @@ -1,13 +1,3 @@ -package org.apache.solr.handler.dataimport; - -import java.io.File; -import java.nio.charset.StandardCharsets; - -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; -import org.apache.solr.request.LocalSolrQueryRequest; -import org.junit.BeforeClass; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -24,6 +14,15 @@ import org.junit.BeforeClass; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.dataimport; + +import java.io.File; +import java.nio.charset.StandardCharsets; + +import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.util.TestUtil; +import org.apache.solr.request.LocalSolrQueryRequest; +import org.junit.BeforeClass; public class TestFileListWithLineEntityProcessor extends AbstractDataImportHandlerTestCase { @BeforeClass diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestHierarchicalDocBuilder.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestHierarchicalDocBuilder.java index 99a4c9a2ec7..44ea047e7c5 100644 --- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestHierarchicalDocBuilder.java +++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestHierarchicalDocBuilder.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.dataimport; - /* * 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.handler.dataimport; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.dataimport; import java.io.IOException; import java.text.MessageFormat; diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestJdbcDataSourceConvertType.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestJdbcDataSourceConvertType.java index 8752188305b..94f437c3709 100644 --- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestJdbcDataSourceConvertType.java +++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestJdbcDataSourceConvertType.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.dataimport; - /* * 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.handler.dataimport; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.dataimport; import com.carrotsearch.randomizedtesting.annotations.ThreadLeakAction; import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering; diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestLineEntityProcessor.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestLineEntityProcessor.java index 0cb07d304af..eb9989c181a 100644 --- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestLineEntityProcessor.java +++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestLineEntityProcessor.java @@ -1,4 +1,3 @@ -package org.apache.solr.handler.dataimport; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.handler.dataimport; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.handler.dataimport; import org.junit.Test; import java.io.IOException; diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestNestedChildren.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestNestedChildren.java index 3ad1555851f..ca1bfda95a8 100644 --- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestNestedChildren.java +++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestNestedChildren.java @@ -1,11 +1,3 @@ -package org.apache.solr.handler.dataimport; - -import java.lang.invoke.MethodHandles; - -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 @@ -22,6 +14,13 @@ import org.slf4j.LoggerFactory; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.dataimport; + +import java.lang.invoke.MethodHandles; + +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class TestNestedChildren extends AbstractDIHJdbcTestCase { diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSimplePropertiesWriter.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSimplePropertiesWriter.java index 1417baa19ee..3c476a7a0d2 100644 --- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSimplePropertiesWriter.java +++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSimplePropertiesWriter.java @@ -1,3 +1,19 @@ +/* + * 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.handler.dataimport; import java.io.File; @@ -21,23 +37,6 @@ 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 TestSimplePropertiesWriter extends AbstractDIHJdbcTestCase { private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java index 5b40a2d0f0d..1253f1643e9 100644 --- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java +++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorEndToEnd.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.dataimport; - /* * 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.handler.dataimport; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.dataimport; import org.apache.commons.io.FileUtils; import org.apache.lucene.util.IOUtils; diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorUnit.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorUnit.java index 299cc5775d3..a8fcbb18cb5 100644 --- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorUnit.java +++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSolrEntityProcessorUnit.java @@ -6,7 +6,7 @@ * (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 + * 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, diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSortedMapBackedCache.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSortedMapBackedCache.java index 0deda5128ad..05cbe179e62 100644 --- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSortedMapBackedCache.java +++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSortedMapBackedCache.java @@ -1,7 +1,3 @@ -package org.apache.solr.handler.dataimport; - -import java.lang.invoke.MethodHandles; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import java.lang.invoke.MethodHandles; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.dataimport; + +import java.lang.invoke.MethodHandles; import java.math.BigDecimal; import java.util.ArrayList; diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSqlEntityProcessor.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSqlEntityProcessor.java index c2dfdd0f6f5..f1277c91f30 100644 --- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSqlEntityProcessor.java +++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSqlEntityProcessor.java @@ -1,8 +1,3 @@ -package org.apache.solr.handler.dataimport; - -import org.junit.Ignore; -import org.junit.Test; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -19,6 +14,10 @@ import org.junit.Test; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.dataimport; + +import org.junit.Ignore; +import org.junit.Test; /** * Test with various combinations of parameters, child entities, caches, transformers. diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta.java index 28ca1fb0da8..1750bda2c57 100644 --- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta.java +++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestSqlEntityProcessorDelta.java @@ -1,14 +1,3 @@ -package org.apache.solr.handler.dataimport; - -import java.lang.invoke.MethodHandles; - -import org.apache.solr.request.LocalSolrQueryRequest; -import org.junit.Before; -import org.junit.Ignore; -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 @@ -25,6 +14,16 @@ import org.slf4j.LoggerFactory; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.dataimport; + +import java.lang.invoke.MethodHandles; + +import org.apache.solr.request.LocalSolrQueryRequest; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Test with various combinations of parameters, child entities, transformers. diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestVariableResolverEndToEnd.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestVariableResolverEndToEnd.java index afa41c3f35f..0f53b939338 100644 --- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestVariableResolverEndToEnd.java +++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestVariableResolverEndToEnd.java @@ -1,19 +1,3 @@ -package org.apache.solr.handler.dataimport; - -import java.lang.invoke.MethodHandles; -import java.sql.Connection; -import java.sql.Statement; -import java.util.Locale; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import junit.framework.Assert; - -import org.apache.solr.request.SolrQueryRequest; -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 @@ -30,6 +14,21 @@ import org.slf4j.LoggerFactory; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.dataimport; + +import java.lang.invoke.MethodHandles; +import java.sql.Connection; +import java.sql.Statement; +import java.util.Locale; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import junit.framework.Assert; + +import org.apache.solr.request.SolrQueryRequest; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class TestVariableResolverEndToEnd extends AbstractDIHJdbcTestCase { diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestXPathRecordReader.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestXPathRecordReader.java index 58e57fe54c7..5f9a5ca095a 100644 --- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestXPathRecordReader.java +++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestXPathRecordReader.java @@ -9,7 +9,7 @@ * 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 onT an "AS IS" BASIS, + * 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. diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestZKPropertiesWriter.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestZKPropertiesWriter.java index ff0095d7520..c8727d037c8 100644 --- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestZKPropertiesWriter.java +++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TestZKPropertiesWriter.java @@ -1,7 +1,3 @@ -package org.apache.solr.handler.dataimport; - -import java.lang.invoke.MethodHandles; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import java.lang.invoke.MethodHandles; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.dataimport; + +import java.lang.invoke.MethodHandles; import java.text.SimpleDateFormat; import java.util.ArrayList; diff --git a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TripleThreatTransformer.java b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TripleThreatTransformer.java index 63f3e253bf4..2d0aadbe78c 100644 --- a/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TripleThreatTransformer.java +++ b/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/TripleThreatTransformer.java @@ -1,11 +1,3 @@ -package org.apache.solr.handler.dataimport; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -22,6 +14,14 @@ import java.util.Map; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.dataimport; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + /** * This transformer does 3 things *

    diff --git a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ParseContextConfig.java b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ParseContextConfig.java index 19a89312b7e..8b9f1ef7650 100644 --- a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ParseContextConfig.java +++ b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/ParseContextConfig.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.extraction; - /* * 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.handler.extraction; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.extraction; import javax.xml.parsers.DocumentBuilderFactory; import java.beans.BeanInfo; diff --git a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/RegexRulesPasswordProvider.java b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/RegexRulesPasswordProvider.java index ccf1c4d3f57..41175a0987f 100644 --- a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/RegexRulesPasswordProvider.java +++ b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/RegexRulesPasswordProvider.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.extraction; import java.io.BufferedReader; diff --git a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/SolrContentHandler.java b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/SolrContentHandler.java index 8e3dc259177..442e64c1e4e 100644 --- a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/SolrContentHandler.java +++ b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/SolrContentHandler.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.extraction; import java.lang.invoke.MethodHandles; diff --git a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/package-info.java b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/package-info.java index 729a2767964..deaa1326bc3 100644 --- a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/package-info.java +++ b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * {@link org.apache.solr.handler.extraction.ExtractingRequestHandler} and related code. */ diff --git a/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java b/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java index 0d4efa18e93..23ca28a6b9d 100644 --- a/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java +++ b/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ExtractingRequestHandlerTest.java @@ -1,4 +1,3 @@ -package org.apache.solr.handler.extraction; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.handler.extraction; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.handler.extraction; import java.util.ArrayList; import java.util.List; import java.util.Locale; diff --git a/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ParseContextConfigTest.java b/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ParseContextConfigTest.java index 6098efcb569..8aeeaad1a42 100644 --- a/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ParseContextConfigTest.java +++ b/solr/contrib/extraction/src/test/org/apache/solr/handler/extraction/ParseContextConfigTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.extraction; - /* * 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.handler.extraction; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.extraction; import javax.xml.parsers.DocumentBuilderFactory; import java.nio.file.Paths; diff --git a/solr/contrib/langid/src/java/org/apache/solr/update/processor/DetectedLanguage.java b/solr/contrib/langid/src/java/org/apache/solr/update/processor/DetectedLanguage.java index b8371f9db9b..e8e6fbef5a9 100644 --- a/solr/contrib/langid/src/java/org/apache/solr/update/processor/DetectedLanguage.java +++ b/solr/contrib/langid/src/java/org/apache/solr/update/processor/DetectedLanguage.java @@ -1,5 +1,3 @@ -package org.apache.solr.update.processor; - /* * 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.update.processor; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update.processor; /** * Bean holding a language and a detection certainty diff --git a/solr/contrib/langid/src/java/org/apache/solr/update/processor/LangDetectLanguageIdentifierUpdateProcessor.java b/solr/contrib/langid/src/java/org/apache/solr/update/processor/LangDetectLanguageIdentifierUpdateProcessor.java index aae25f84d6a..8af05b35ba0 100644 --- a/solr/contrib/langid/src/java/org/apache/solr/update/processor/LangDetectLanguageIdentifierUpdateProcessor.java +++ b/solr/contrib/langid/src/java/org/apache/solr/update/processor/LangDetectLanguageIdentifierUpdateProcessor.java @@ -1,5 +1,3 @@ -package org.apache.solr.update.processor; - /* * 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.update.processor; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update.processor; import java.lang.invoke.MethodHandles; import java.util.ArrayList; diff --git a/solr/contrib/langid/src/java/org/apache/solr/update/processor/LangDetectLanguageIdentifierUpdateProcessorFactory.java b/solr/contrib/langid/src/java/org/apache/solr/update/processor/LangDetectLanguageIdentifierUpdateProcessorFactory.java index 633d1a7290c..dcf1bd5b562 100644 --- a/solr/contrib/langid/src/java/org/apache/solr/update/processor/LangDetectLanguageIdentifierUpdateProcessorFactory.java +++ b/solr/contrib/langid/src/java/org/apache/solr/update/processor/LangDetectLanguageIdentifierUpdateProcessorFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.update.processor; - /* * 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.update.processor; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update.processor; import java.io.BufferedReader; import java.io.IOException; diff --git a/solr/contrib/langid/src/java/org/apache/solr/update/processor/LangIdParams.java b/solr/contrib/langid/src/java/org/apache/solr/update/processor/LangIdParams.java index 4aeff3f64b8..4e19eabc48d 100644 --- a/solr/contrib/langid/src/java/org/apache/solr/update/processor/LangIdParams.java +++ b/solr/contrib/langid/src/java/org/apache/solr/update/processor/LangIdParams.java @@ -1,5 +1,3 @@ -package org.apache.solr.update.processor; - /* * 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.update.processor; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update.processor; public interface LangIdParams { diff --git a/solr/contrib/langid/src/java/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessor.java b/solr/contrib/langid/src/java/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessor.java index 6d48d709abf..a78a1fe3e1e 100644 --- a/solr/contrib/langid/src/java/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessor.java +++ b/solr/contrib/langid/src/java/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessor.java @@ -1,5 +1,3 @@ -package org.apache.solr.update.processor; - /* * 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.update.processor; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update.processor; import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException.ErrorCode; diff --git a/solr/contrib/langid/src/java/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessor.java b/solr/contrib/langid/src/java/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessor.java index ffc6274a635..3d3fa41be00 100644 --- a/solr/contrib/langid/src/java/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessor.java +++ b/solr/contrib/langid/src/java/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessor.java @@ -1,5 +1,3 @@ -package org.apache.solr.update.processor; - /* * 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.update.processor; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update.processor; import java.lang.invoke.MethodHandles; import java.util.ArrayList; diff --git a/solr/contrib/langid/src/java/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessorFactory.java b/solr/contrib/langid/src/java/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessorFactory.java index 7a6c81ea3f2..5d5acd16ad0 100644 --- a/solr/contrib/langid/src/java/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessorFactory.java +++ b/solr/contrib/langid/src/java/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessorFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.update.processor; - /* * 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.update.processor; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update.processor; import org.apache.solr.common.params.SolrParams; import org.apache.solr.common.util.NamedList; diff --git a/solr/contrib/langid/src/test/org/apache/solr/update/processor/LangDetectLanguageIdentifierUpdateProcessorFactoryTest.java b/solr/contrib/langid/src/test/org/apache/solr/update/processor/LangDetectLanguageIdentifierUpdateProcessorFactoryTest.java index 053e226526e..e7d3c157b89 100644 --- a/solr/contrib/langid/src/test/org/apache/solr/update/processor/LangDetectLanguageIdentifierUpdateProcessorFactoryTest.java +++ b/solr/contrib/langid/src/test/org/apache/solr/update/processor/LangDetectLanguageIdentifierUpdateProcessorFactoryTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.update.processor; - /* * 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.update.processor; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update.processor; import org.apache.solr.common.SolrInputDocument; import org.apache.solr.common.params.ModifiableSolrParams; diff --git a/solr/contrib/langid/src/test/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessorFactoryTestCase.java b/solr/contrib/langid/src/test/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessorFactoryTestCase.java index 8b987ce3da0..c7381a918e7 100644 --- a/solr/contrib/langid/src/test/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessorFactoryTestCase.java +++ b/solr/contrib/langid/src/test/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessorFactoryTestCase.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import java.util.ArrayList; diff --git a/solr/contrib/langid/src/test/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessorFactoryTest.java b/solr/contrib/langid/src/test/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessorFactoryTest.java index e26c8c7f1a1..172b892fb03 100644 --- a/solr/contrib/langid/src/test/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessorFactoryTest.java +++ b/solr/contrib/langid/src/test/org/apache/solr/update/processor/TikaLanguageIdentifierUpdateProcessorFactoryTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.update.processor; - /* * 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.update.processor; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update.processor; import org.apache.solr.common.SolrInputDocument; import org.apache.solr.common.params.ModifiableSolrParams; diff --git a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/AlphaNumericComparator.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/AlphaNumericComparator.java index cd8f183cee1..f596a880067 100644 --- a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/AlphaNumericComparator.java +++ b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/AlphaNumericComparator.java @@ -19,7 +19,6 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS // IN THE SOFTWARE. - package org.apache.solr.hadoop; import java.util.Comparator; diff --git a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/DataInputInputStream.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/DataInputInputStream.java index 33f609f1f2d..d1d46bce416 100644 --- a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/DataInputInputStream.java +++ b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/DataInputInputStream.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.hadoop; import java.io.DataInput; diff --git a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/UnbufferedDataInputInputStream.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/UnbufferedDataInputInputStream.java index 8a5eaaf6d9e..83823ce8873 100644 --- a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/UnbufferedDataInputInputStream.java +++ b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/UnbufferedDataInputInputStream.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.hadoop; import java.io.BufferedReader; diff --git a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/ZooKeeperInspector.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/ZooKeeperInspector.java index b71c7f1811c..3672e0b7c53 100644 --- a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/ZooKeeperInspector.java +++ b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/ZooKeeperInspector.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.hadoop; import com.google.common.io.Files; diff --git a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/dedup/package-info.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/dedup/package-info.java index a021282654a..bdd1a8694b6 100644 --- a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/dedup/package-info.java +++ b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/dedup/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Dedupe related code. */ diff --git a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/morphline/package-info.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/morphline/package-info.java index c754f79e338..309f2554d27 100644 --- a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/morphline/package-info.java +++ b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/morphline/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Morphlines related code. */ diff --git a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/package-info.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/package-info.java index 043a150e935..b49671b7334 100644 --- a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/package-info.java +++ b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * {@link org.apache.solr.hadoop.MapReduceIndexerTool} and related code. */ diff --git a/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java b/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java index 5f4a588dcb3..1cc1723db9b 100644 --- a/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java +++ b/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineGoLiveMiniMRTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.hadoop; import java.io.File; diff --git a/solr/contrib/morphlines-cell/src/java/org/apache/solr/morphlines/cell/package-info.java b/solr/contrib/morphlines-cell/src/java/org/apache/solr/morphlines/cell/package-info.java index 0f44a70488d..4197bcc9545 100644 --- a/solr/contrib/morphlines-cell/src/java/org/apache/solr/morphlines/cell/package-info.java +++ b/solr/contrib/morphlines-cell/src/java/org/apache/solr/morphlines/cell/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Morphlines Solr Cell related code. */ diff --git a/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/package-info.java b/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/package-info.java index f4b91eca57c..da27bd2513b 100644 --- a/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/package-info.java +++ b/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Morphlines Solr related code. */ diff --git a/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineZkTestBase.java b/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineZkTestBase.java index 763a8d27835..6c76ecb9d78 100644 --- a/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineZkTestBase.java +++ b/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineZkTestBase.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.morphlines.solr; import java.io.File; diff --git a/solr/contrib/uima/src/java/org/apache/solr/uima/processor/FieldMappingException.java b/solr/contrib/uima/src/java/org/apache/solr/uima/processor/FieldMappingException.java index 93460a3e4ba..801d128c0dc 100644 --- a/solr/contrib/uima/src/java/org/apache/solr/uima/processor/FieldMappingException.java +++ b/solr/contrib/uima/src/java/org/apache/solr/uima/processor/FieldMappingException.java @@ -1,5 +1,3 @@ -package org.apache.solr.uima.processor; - /* * 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.uima.processor; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.uima.processor; /** * Exception thrown when an error happening while mapping UIMA CAS model to Solr fields diff --git a/solr/contrib/uima/src/java/org/apache/solr/uima/processor/SolrUIMAConfiguration.java b/solr/contrib/uima/src/java/org/apache/solr/uima/processor/SolrUIMAConfiguration.java index d43914a61b5..ae8bc6c8f39 100644 --- a/solr/contrib/uima/src/java/org/apache/solr/uima/processor/SolrUIMAConfiguration.java +++ b/solr/contrib/uima/src/java/org/apache/solr/uima/processor/SolrUIMAConfiguration.java @@ -1,5 +1,3 @@ -package org.apache.solr.uima.processor; - /* * 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.uima.processor; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.uima.processor; import java.util.Map; diff --git a/solr/contrib/uima/src/java/org/apache/solr/uima/processor/SolrUIMAConfigurationReader.java b/solr/contrib/uima/src/java/org/apache/solr/uima/processor/SolrUIMAConfigurationReader.java index 68fdc48eb1e..6094465a5a3 100644 --- a/solr/contrib/uima/src/java/org/apache/solr/uima/processor/SolrUIMAConfigurationReader.java +++ b/solr/contrib/uima/src/java/org/apache/solr/uima/processor/SolrUIMAConfigurationReader.java @@ -1,5 +1,3 @@ -package org.apache.solr.uima.processor; - /* * 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.uima.processor; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.uima.processor; import java.util.HashMap; import java.util.List; diff --git a/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAToSolrMapper.java b/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAToSolrMapper.java index 03238c06d90..024dc4e2888 100644 --- a/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAToSolrMapper.java +++ b/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAToSolrMapper.java @@ -1,5 +1,3 @@ -package org.apache.solr.uima.processor; - /* * 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.uima.processor; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.uima.processor; import org.apache.solr.common.SolrInputDocument; import org.apache.solr.uima.processor.SolrUIMAConfiguration.MapField; diff --git a/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessor.java b/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessor.java index ec7a85338ba..6bfda41cf81 100644 --- a/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessor.java +++ b/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessor.java @@ -1,5 +1,3 @@ -package org.apache.solr.uima.processor; - /* * 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.uima.processor; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.uima.processor; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorFactory.java b/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorFactory.java index 2f89dc554c1..57ebc72e6a8 100644 --- a/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorFactory.java +++ b/solr/contrib/uima/src/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.uima.processor; - /* * 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.uima.processor; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.uima.processor; import org.apache.lucene.analysis.uima.ae.AEProvider; import org.apache.lucene.analysis.uima.ae.AEProviderFactory; diff --git a/solr/contrib/uima/src/java/org/apache/solr/uima/processor/package-info.java b/solr/contrib/uima/src/java/org/apache/solr/uima/processor/package-info.java index 4525c33c23e..65d66e5f9d3 100644 --- a/solr/contrib/uima/src/java/org/apache/solr/uima/processor/package-info.java +++ b/solr/contrib/uima/src/java/org/apache/solr/uima/processor/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * {@link org.apache.solr.uima.processor.UIMAUpdateRequestProcessorFactory} and related code. */ diff --git a/solr/contrib/uima/src/test/org/apache/solr/uima/analysis/UIMATokenizersSolrIntegrationTest.java b/solr/contrib/uima/src/test/org/apache/solr/uima/analysis/UIMATokenizersSolrIntegrationTest.java index 1da1568f0e4..91976975b46 100644 --- a/solr/contrib/uima/src/test/org/apache/solr/uima/analysis/UIMATokenizersSolrIntegrationTest.java +++ b/solr/contrib/uima/src/test/org/apache/solr/uima/analysis/UIMATokenizersSolrIntegrationTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.uima.analysis; - /* * 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.uima.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.uima.analysis; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.request.SolrQueryRequest; diff --git a/solr/contrib/uima/src/test/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java b/solr/contrib/uima/src/test/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java index 59bfe4f9eaa..95feb365fa0 100644 --- a/solr/contrib/uima/src/test/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java +++ b/solr/contrib/uima/src/test/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.uima.processor; - /* * 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.uima.processor; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.uima.processor; import java.util.ArrayList; import java.util.HashMap; diff --git a/solr/contrib/uima/src/test/org/apache/solr/uima/processor/an/DummyEntityAnnotator.java b/solr/contrib/uima/src/test/org/apache/solr/uima/processor/an/DummyEntityAnnotator.java index 6444b89cc31..9bb35d2c4c1 100644 --- a/solr/contrib/uima/src/test/org/apache/solr/uima/processor/an/DummyEntityAnnotator.java +++ b/solr/contrib/uima/src/test/org/apache/solr/uima/processor/an/DummyEntityAnnotator.java @@ -1,12 +1,3 @@ -package org.apache.solr.uima.processor.an; - -import org.apache.solr.uima.ts.EntityAnnotation; -import org.apache.uima.TokenAnnotation; -import org.apache.uima.analysis_component.JCasAnnotator_ImplBase; -import org.apache.uima.analysis_engine.AnalysisEngineProcessException; -import org.apache.uima.jcas.JCas; -import org.apache.uima.jcas.tcas.Annotation; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -23,6 +14,14 @@ import org.apache.uima.jcas.tcas.Annotation; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.uima.processor.an; + +import org.apache.solr.uima.ts.EntityAnnotation; +import org.apache.uima.TokenAnnotation; +import org.apache.uima.analysis_component.JCasAnnotator_ImplBase; +import org.apache.uima.analysis_engine.AnalysisEngineProcessException; +import org.apache.uima.jcas.JCas; +import org.apache.uima.jcas.tcas.Annotation; public class DummyEntityAnnotator extends JCasAnnotator_ImplBase{ diff --git a/solr/contrib/uima/src/test/org/apache/solr/uima/processor/an/DummyExceptionAnnotator.java b/solr/contrib/uima/src/test/org/apache/solr/uima/processor/an/DummyExceptionAnnotator.java index 5838ade6d38..606c4e5de2b 100644 --- a/solr/contrib/uima/src/test/org/apache/solr/uima/processor/an/DummyExceptionAnnotator.java +++ b/solr/contrib/uima/src/test/org/apache/solr/uima/processor/an/DummyExceptionAnnotator.java @@ -1,9 +1,3 @@ -package org.apache.solr.uima.processor.an; - -import org.apache.uima.analysis_component.JCasAnnotator_ImplBase; -import org.apache.uima.analysis_engine.AnalysisEngineProcessException; -import org.apache.uima.jcas.JCas; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -20,6 +14,11 @@ import org.apache.uima.jcas.JCas; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.uima.processor.an; + +import org.apache.uima.analysis_component.JCasAnnotator_ImplBase; +import org.apache.uima.analysis_engine.AnalysisEngineProcessException; +import org.apache.uima.jcas.JCas; public class DummyExceptionAnnotator extends JCasAnnotator_ImplBase{ diff --git a/solr/contrib/uima/src/test/org/apache/solr/uima/processor/an/DummySentimentAnnotator.java b/solr/contrib/uima/src/test/org/apache/solr/uima/processor/an/DummySentimentAnnotator.java index 5e0bb5d495f..521db716ba2 100644 --- a/solr/contrib/uima/src/test/org/apache/solr/uima/processor/an/DummySentimentAnnotator.java +++ b/solr/contrib/uima/src/test/org/apache/solr/uima/processor/an/DummySentimentAnnotator.java @@ -1,14 +1,3 @@ -package org.apache.solr.uima.processor.an; - -import java.util.Arrays; - -import org.apache.solr.uima.ts.DummySentimentAnnotation; -import org.apache.uima.TokenAnnotation; -import org.apache.uima.analysis_component.JCasAnnotator_ImplBase; -import org.apache.uima.analysis_engine.AnalysisEngineProcessException; -import org.apache.uima.jcas.JCas; -import org.apache.uima.jcas.tcas.Annotation; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -25,6 +14,16 @@ import org.apache.uima.jcas.tcas.Annotation; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.uima.processor.an; + +import java.util.Arrays; + +import org.apache.solr.uima.ts.DummySentimentAnnotation; +import org.apache.uima.TokenAnnotation; +import org.apache.uima.analysis_component.JCasAnnotator_ImplBase; +import org.apache.uima.analysis_engine.AnalysisEngineProcessException; +import org.apache.uima.jcas.JCas; +import org.apache.uima.jcas.tcas.Annotation; public class DummySentimentAnnotator extends JCasAnnotator_ImplBase{ diff --git a/solr/contrib/velocity/src/java/org/apache/solr/response/PageTool.java b/solr/contrib/velocity/src/java/org/apache/solr/response/PageTool.java index 6c35d4df71a..1947f36167a 100644 --- a/solr/contrib/velocity/src/java/org/apache/solr/response/PageTool.java +++ b/solr/contrib/velocity/src/java/org/apache/solr/response/PageTool.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.response; import org.apache.solr.request.SolrQueryRequest; diff --git a/solr/contrib/velocity/src/java/org/apache/solr/response/SolrParamResourceLoader.java b/solr/contrib/velocity/src/java/org/apache/solr/response/SolrParamResourceLoader.java index 864dfc2f5de..17b28784979 100644 --- a/solr/contrib/velocity/src/java/org/apache/solr/response/SolrParamResourceLoader.java +++ b/solr/contrib/velocity/src/java/org/apache/solr/response/SolrParamResourceLoader.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.response; import org.apache.solr.request.SolrQueryRequest; diff --git a/solr/contrib/velocity/src/java/org/apache/solr/response/SolrVelocityLogger.java b/solr/contrib/velocity/src/java/org/apache/solr/response/SolrVelocityLogger.java index 4cb824a34ed..00f817f7fc6 100644 --- a/solr/contrib/velocity/src/java/org/apache/solr/response/SolrVelocityLogger.java +++ b/solr/contrib/velocity/src/java/org/apache/solr/response/SolrVelocityLogger.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 @@ -16,6 +14,7 @@ package org.apache.solr.response; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.response; import org.apache.velocity.runtime.RuntimeServices; import org.apache.velocity.runtime.log.LogChute; diff --git a/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java b/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java index 8d8b982f7bd..7a0f2a10552 100644 --- a/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java +++ b/solr/contrib/velocity/src/java/org/apache/solr/response/VelocityResponseWriter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.response; import java.io.File; diff --git a/solr/contrib/velocity/src/test/org/apache/solr/velocity/MockTool.java b/solr/contrib/velocity/src/test/org/apache/solr/velocity/MockTool.java index 94d587938cd..c6287fd9d33 100644 --- a/solr/contrib/velocity/src/test/org/apache/solr/velocity/MockTool.java +++ b/solr/contrib/velocity/src/test/org/apache/solr/velocity/MockTool.java @@ -1,5 +1,3 @@ -package org.apache.solr.velocity; - /* * 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.velocity; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.velocity; import org.apache.solr.core.SolrCore; import org.apache.velocity.tools.generic.LocaleConfig; diff --git a/solr/contrib/velocity/src/test/org/apache/solr/velocity/VelocityResponseWriterTest.java b/solr/contrib/velocity/src/test/org/apache/solr/velocity/VelocityResponseWriterTest.java index 881fb998192..336ee4bbde4 100644 --- a/solr/contrib/velocity/src/test/org/apache/solr/velocity/VelocityResponseWriterTest.java +++ b/solr/contrib/velocity/src/test/org/apache/solr/velocity/VelocityResponseWriterTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.velocity; import org.apache.solr.SolrTestCaseJ4; diff --git a/solr/core/src/java/org/apache/solr/analysis/ReversedWildcardFilter.java b/solr/core/src/java/org/apache/solr/analysis/ReversedWildcardFilter.java index fcaaf76d035..37fd95bee4a 100644 --- a/solr/core/src/java/org/apache/solr/analysis/ReversedWildcardFilter.java +++ b/solr/core/src/java/org/apache/solr/analysis/ReversedWildcardFilter.java @@ -1,4 +1,3 @@ -package org.apache.solr.analysis; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.analysis; import java.io.IOException; import org.apache.lucene.analysis.TokenFilter; diff --git a/solr/core/src/java/org/apache/solr/analysis/ReversedWildcardFilterFactory.java b/solr/core/src/java/org/apache/solr/analysis/ReversedWildcardFilterFactory.java index 7384b418b1e..e64957f26f4 100644 --- a/solr/core/src/java/org/apache/solr/analysis/ReversedWildcardFilterFactory.java +++ b/solr/core/src/java/org/apache/solr/analysis/ReversedWildcardFilterFactory.java @@ -1,4 +1,3 @@ -package org.apache.solr.analysis; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.analysis; import java.util.Map; import org.apache.lucene.analysis.TokenStream; diff --git a/solr/core/src/java/org/apache/solr/analysis/SolrAnalyzer.java b/solr/core/src/java/org/apache/solr/analysis/SolrAnalyzer.java index a33a373e11d..38d0d17bd09 100644 --- a/solr/core/src/java/org/apache/solr/analysis/SolrAnalyzer.java +++ b/solr/core/src/java/org/apache/solr/analysis/SolrAnalyzer.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analysis; import org.apache.lucene.analysis.Analyzer; diff --git a/solr/core/src/java/org/apache/solr/analysis/TokenizerChain.java b/solr/core/src/java/org/apache/solr/analysis/TokenizerChain.java index ca51d69fbda..c9f263d44d7 100644 --- a/solr/core/src/java/org/apache/solr/analysis/TokenizerChain.java +++ b/solr/core/src/java/org/apache/solr/analysis/TokenizerChain.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analysis; import org.apache.lucene.analysis.*; diff --git a/solr/core/src/java/org/apache/solr/analysis/package-info.java b/solr/core/src/java/org/apache/solr/analysis/package-info.java index e8a48bff739..5b0fe9a800a 100644 --- a/solr/core/src/java/org/apache/solr/analysis/package-info.java +++ b/solr/core/src/java/org/apache/solr/analysis/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Factories and classes specific to text analysis and the creation of {@link org.apache.lucene.analysis.TokenStream}s *

    diff --git a/solr/core/src/java/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java b/solr/core/src/java/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java index 17e7e4e7552..4aa8b211cdf 100644 --- a/solr/core/src/java/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java +++ b/solr/core/src/java/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.embedded; import java.io.ByteArrayInputStream; diff --git a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettyConfig.java b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettyConfig.java index 59ff3312500..28c3cdfc7f7 100644 --- a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettyConfig.java +++ b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettyConfig.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.embedded; import org.eclipse.jetty.servlet.ServletHolder; diff --git a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java index c143f6ccbc4..ba2aa1049c9 100644 --- a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java +++ b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.embedded; import javax.servlet.DispatcherType; diff --git a/solr/core/src/java/org/apache/solr/client/solrj/embedded/SSLConfig.java b/solr/core/src/java/org/apache/solr/client/solrj/embedded/SSLConfig.java index f969cd71297..77bb759782a 100644 --- a/solr/core/src/java/org/apache/solr/client/solrj/embedded/SSLConfig.java +++ b/solr/core/src/java/org/apache/solr/client/solrj/embedded/SSLConfig.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.embedded; - /* * 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.embedded; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.embedded; import org.eclipse.jetty.util.ssl.SslContextFactory; diff --git a/solr/core/src/java/org/apache/solr/client/solrj/embedded/package-info.java b/solr/core/src/java/org/apache/solr/client/solrj/embedded/package-info.java index a74c7458a57..f1a256d41fa 100644 --- a/solr/core/src/java/org/apache/solr/client/solrj/embedded/package-info.java +++ b/solr/core/src/java/org/apache/solr/client/solrj/embedded/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * SolrJ client implementations for embedded solr access. *

    diff --git a/solr/core/src/java/org/apache/solr/cloud/ActionThrottle.java b/solr/core/src/java/org/apache/solr/cloud/ActionThrottle.java index 97d6e3ddb1d..fbfa9c5670e 100644 --- a/solr/core/src/java/org/apache/solr/cloud/ActionThrottle.java +++ b/solr/core/src/java/org/apache/solr/cloud/ActionThrottle.java @@ -1,7 +1,3 @@ -package org.apache.solr.cloud; - -import java.lang.invoke.MethodHandles; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import java.lang.invoke.MethodHandles; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; + +import java.lang.invoke.MethodHandles; import java.util.concurrent.TimeUnit; diff --git a/solr/core/src/java/org/apache/solr/cloud/Assign.java b/solr/core/src/java/org/apache/solr/cloud/Assign.java index ff3b9ba1f92..ca94c409f9a 100644 --- a/solr/core/src/java/org/apache/solr/cloud/Assign.java +++ b/solr/core/src/java/org/apache/solr/cloud/Assign.java @@ -1,21 +1,20 @@ -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 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 - * + * 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. + * 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 java.util.ArrayList; import java.util.Collection; diff --git a/solr/core/src/java/org/apache/solr/cloud/CloudConfigSetService.java b/solr/core/src/java/org/apache/solr/cloud/CloudConfigSetService.java index c371c749796..bf11e921850 100644 --- a/solr/core/src/java/org/apache/solr/cloud/CloudConfigSetService.java +++ b/solr/core/src/java/org/apache/solr/cloud/CloudConfigSetService.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.cloud; import org.apache.solr.core.ConfigSetService; diff --git a/solr/core/src/java/org/apache/solr/cloud/CloudDescriptor.java b/solr/core/src/java/org/apache/solr/cloud/CloudDescriptor.java index dbf33af4aeb..4dd1527b0c1 100644 --- a/solr/core/src/java/org/apache/solr/cloud/CloudDescriptor.java +++ b/solr/core/src/java/org/apache/solr/cloud/CloudDescriptor.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.util.HashMap; import java.util.Map; diff --git a/solr/core/src/java/org/apache/solr/cloud/CloudUtil.java b/solr/core/src/java/org/apache/solr/cloud/CloudUtil.java index b84d9985ca7..c62efa6a694 100644 --- a/solr/core/src/java/org/apache/solr/cloud/CloudUtil.java +++ b/solr/core/src/java/org/apache/solr/cloud/CloudUtil.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.io.File; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/cloud/CurrentCoreDescriptorProvider.java b/solr/core/src/java/org/apache/solr/cloud/CurrentCoreDescriptorProvider.java index db152813b98..29d07511cee 100644 --- a/solr/core/src/java/org/apache/solr/cloud/CurrentCoreDescriptorProvider.java +++ b/solr/core/src/java/org/apache/solr/cloud/CurrentCoreDescriptorProvider.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.util.List; diff --git a/solr/core/src/java/org/apache/solr/cloud/DistributedMap.java b/solr/core/src/java/org/apache/solr/cloud/DistributedMap.java index d407241192a..ec2ecb7856b 100644 --- a/solr/core/src/java/org/apache/solr/cloud/DistributedMap.java +++ b/solr/core/src/java/org/apache/solr/cloud/DistributedMap.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException.ErrorCode; diff --git a/solr/core/src/java/org/apache/solr/cloud/DistributedQueue.java b/solr/core/src/java/org/apache/solr/cloud/DistributedQueue.java index f2723928e20..87d92c668dd 100644 --- a/solr/core/src/java/org/apache/solr/cloud/DistributedQueue.java +++ b/solr/core/src/java/org/apache/solr/cloud/DistributedQueue.java @@ -1,5 +1,4 @@ /* - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -15,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.cloud; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java b/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java index 3d05fb236ce..30db6f192e2 100644 --- a/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java +++ b/solr/core/src/java/org/apache/solr/cloud/ElectionContext.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.io.Closeable; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java b/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java index 2a8f84b3283..056b4b9846e 100644 --- a/solr/core/src/java/org/apache/solr/cloud/LeaderElector.java +++ b/solr/core/src/java/org/apache/solr/cloud/LeaderElector.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/java/org/apache/solr/cloud/LeaderInitiatedRecoveryThread.java b/solr/core/src/java/org/apache/solr/cloud/LeaderInitiatedRecoveryThread.java index 44ec1010109..7a72a6782ee 100644 --- a/solr/core/src/java/org/apache/solr/cloud/LeaderInitiatedRecoveryThread.java +++ b/solr/core/src/java/org/apache/solr/cloud/LeaderInitiatedRecoveryThread.java @@ -1,3 +1,19 @@ +/* + * 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 org.apache.http.NoHttpResponseException; @@ -24,23 +40,6 @@ import java.net.ConnectException; import java.net.SocketException; import java.util.List; -/* - * 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. - */ - /** * Background daemon thread that tries to send the REQUESTRECOVERY to a downed * replica; used by a shard leader to nag a replica into recovering after the diff --git a/solr/core/src/java/org/apache/solr/cloud/Overseer.java b/solr/core/src/java/org/apache/solr/cloud/Overseer.java index e9a3c61eef2..53611c09176 100644 --- a/solr/core/src/java/org/apache/solr/cloud/Overseer.java +++ b/solr/core/src/java/org/apache/solr/cloud/Overseer.java @@ -1,21 +1,20 @@ -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 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 - * + * 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. + * 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 java.io.Closeable; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerAutoReplicaFailoverThread.java b/solr/core/src/java/org/apache/solr/cloud/OverseerAutoReplicaFailoverThread.java index 9b0899d409d..d6aa3926229 100644 --- a/solr/core/src/java/org/apache/solr/cloud/OverseerAutoReplicaFailoverThread.java +++ b/solr/core/src/java/org/apache/solr/cloud/OverseerAutoReplicaFailoverThread.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionConfigSetProcessor.java b/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionConfigSetProcessor.java index eef56c6f17e..f1d0ab27359 100644 --- a/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionConfigSetProcessor.java +++ b/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionConfigSetProcessor.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.solr.common.cloud.ZkNodeProps; import org.apache.solr.common.cloud.ZkStateReader; diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java b/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java index 14e74b4eb65..d0548a0f0e2 100644 --- a/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java +++ b/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerConfigSetMessageHandler.java b/solr/core/src/java/org/apache/solr/cloud/OverseerConfigSetMessageHandler.java index 686d72b66cb..1f972ffde84 100644 --- a/solr/core/src/java/org/apache/solr/cloud/OverseerConfigSetMessageHandler.java +++ b/solr/core/src/java/org/apache/solr/cloud/OverseerConfigSetMessageHandler.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerMessageHandler.java b/solr/core/src/java/org/apache/solr/cloud/OverseerMessageHandler.java index e374b472077..2d2408f7218 100644 --- a/solr/core/src/java/org/apache/solr/cloud/OverseerMessageHandler.java +++ b/solr/core/src/java/org/apache/solr/cloud/OverseerMessageHandler.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.solr.client.solrj.SolrResponse; import org.apache.solr.common.cloud.ZkNodeProps; diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerNodePrioritizer.java b/solr/core/src/java/org/apache/solr/cloud/OverseerNodePrioritizer.java index 2e7c2fe707d..fbd8218804d 100644 --- a/solr/core/src/java/org/apache/solr/cloud/OverseerNodePrioritizer.java +++ b/solr/core/src/java/org/apache/solr/cloud/OverseerNodePrioritizer.java @@ -1,7 +1,3 @@ -package org.apache.solr.cloud; - -import java.lang.invoke.MethodHandles; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import java.lang.invoke.MethodHandles; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; + +import java.lang.invoke.MethodHandles; import java.util.List; import java.util.Map; diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerSolrResponse.java b/solr/core/src/java/org/apache/solr/cloud/OverseerSolrResponse.java index 4d2c60e29a8..92f6443eace 100644 --- a/solr/core/src/java/org/apache/solr/cloud/OverseerSolrResponse.java +++ b/solr/core/src/java/org/apache/solr/cloud/OverseerSolrResponse.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.solr.client.solrj.SolrResponse; import org.apache.solr.common.util.NamedList; diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java b/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java index ddaa5e2824a..eaad7658964 100644 --- a/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.java +++ b/solr/core/src/java/org/apache/solr/cloud/OverseerTaskProcessor.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.io.Closeable; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerTaskQueue.java b/solr/core/src/java/org/apache/solr/cloud/OverseerTaskQueue.java index c307cc45c73..ea219d30623 100644 --- a/solr/core/src/java/org/apache/solr/cloud/OverseerTaskQueue.java +++ b/solr/core/src/java/org/apache/solr/cloud/OverseerTaskQueue.java @@ -1,7 +1,3 @@ -package org.apache.solr.cloud; - -import java.lang.invoke.MethodHandles; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import java.lang.invoke.MethodHandles; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; + +import java.lang.invoke.MethodHandles; import java.util.ArrayList; import java.util.List; diff --git a/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java b/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java index aae53c72ea9..5daa6af2225 100644 --- a/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.java +++ b/solr/core/src/java/org/apache/solr/cloud/RecoveryStrategy.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.io.Closeable; diff --git a/solr/core/src/java/org/apache/solr/cloud/SizeLimitedDistributedMap.java b/solr/core/src/java/org/apache/solr/cloud/SizeLimitedDistributedMap.java index b9d0dec8ec7..418eb664641 100644 --- a/solr/core/src/java/org/apache/solr/cloud/SizeLimitedDistributedMap.java +++ b/solr/core/src/java/org/apache/solr/cloud/SizeLimitedDistributedMap.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.util.List; diff --git a/solr/core/src/java/org/apache/solr/cloud/SolrZkServer.java b/solr/core/src/java/org/apache/solr/cloud/SolrZkServer.java index 596de0faafa..736101add5f 100644 --- a/solr/core/src/java/org/apache/solr/cloud/SolrZkServer.java +++ b/solr/core/src/java/org/apache/solr/cloud/SolrZkServer.java @@ -1,21 +1,20 @@ -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 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 - * + * 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. + * 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 org.apache.solr.common.SolrException; import org.apache.zookeeper.server.ServerConfig; diff --git a/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java b/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java index d555f611ca4..7a16598bbcd 100644 --- a/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java +++ b/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java @@ -1,11 +1,3 @@ -package org.apache.solr.cloud; - -import java.io.IOException; -import java.lang.invoke.MethodHandles; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.ExecutorService; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -22,6 +14,13 @@ import java.util.concurrent.ExecutorService; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; + +import java.io.IOException; +import java.lang.invoke.MethodHandles; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.ExecutorService; import org.apache.http.client.HttpClient; import org.apache.solr.client.solrj.SolrServerException; diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkCLI.java b/solr/core/src/java/org/apache/solr/cloud/ZkCLI.java index b756e1672ff..8d52ea2a3fd 100644 --- a/solr/core/src/java/org/apache/solr/cloud/ZkCLI.java +++ b/solr/core/src/java/org/apache/solr/cloud/ZkCLI.java @@ -1,3 +1,19 @@ +/* + * 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.common.params.CommonParams.*; @@ -33,23 +49,6 @@ import java.nio.file.Paths; import java.util.List; import java.util.concurrent.TimeoutException; -/* - * 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 ZkCLI { private static final String MAKEPATH = "makepath"; diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.java index fea82ecbb73..44af3f18ee0 100644 --- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java +++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.io.IOException; import java.io.UnsupportedEncodingException; diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java b/solr/core/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java index 94780a6bb11..4d12db906d4 100644 --- a/solr/core/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java +++ b/solr/core/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.io.ByteArrayInputStream; import java.io.File; diff --git a/solr/core/src/java/org/apache/solr/cloud/overseer/ClusterStateMutator.java b/solr/core/src/java/org/apache/solr/cloud/overseer/ClusterStateMutator.java index 0e10ea272b8..7ffa8c1d556 100644 --- a/solr/core/src/java/org/apache/solr/cloud/overseer/ClusterStateMutator.java +++ b/solr/core/src/java/org/apache/solr/cloud/overseer/ClusterStateMutator.java @@ -1,7 +1,3 @@ -package org.apache.solr.cloud.overseer; - -import java.lang.invoke.MethodHandles; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import java.lang.invoke.MethodHandles; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud.overseer; + +import java.lang.invoke.MethodHandles; import java.util.ArrayList; import java.util.Collection; diff --git a/solr/core/src/java/org/apache/solr/cloud/overseer/CollectionMutator.java b/solr/core/src/java/org/apache/solr/cloud/overseer/CollectionMutator.java index 6bf5e2e71ff..4f7cb52070d 100644 --- a/solr/core/src/java/org/apache/solr/cloud/overseer/CollectionMutator.java +++ b/solr/core/src/java/org/apache/solr/cloud/overseer/CollectionMutator.java @@ -1,7 +1,3 @@ -package org.apache.solr.cloud.overseer; - -import java.lang.invoke.MethodHandles; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import java.lang.invoke.MethodHandles; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud.overseer; + +import java.lang.invoke.MethodHandles; import java.util.Collections; import java.util.HashMap; diff --git a/solr/core/src/java/org/apache/solr/cloud/overseer/OverseerAction.java b/solr/core/src/java/org/apache/solr/cloud/overseer/OverseerAction.java index 9a2c70bd356..ad766a3473e 100644 --- a/solr/core/src/java/org/apache/solr/cloud/overseer/OverseerAction.java +++ b/solr/core/src/java/org/apache/solr/cloud/overseer/OverseerAction.java @@ -1,5 +1,3 @@ -package org.apache.solr.cloud.overseer; - /* * 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.cloud.overseer; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud.overseer; import java.util.Locale; diff --git a/solr/core/src/java/org/apache/solr/cloud/overseer/ReplicaMutator.java b/solr/core/src/java/org/apache/solr/cloud/overseer/ReplicaMutator.java index bfba78de792..a3efc8099fc 100644 --- a/solr/core/src/java/org/apache/solr/cloud/overseer/ReplicaMutator.java +++ b/solr/core/src/java/org/apache/solr/cloud/overseer/ReplicaMutator.java @@ -1,7 +1,3 @@ -package org.apache.solr.cloud.overseer; - -import java.lang.invoke.MethodHandles; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import java.lang.invoke.MethodHandles; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud.overseer; + +import java.lang.invoke.MethodHandles; import java.util.ArrayList; import java.util.HashMap; diff --git a/solr/core/src/java/org/apache/solr/cloud/overseer/SliceMutator.java b/solr/core/src/java/org/apache/solr/cloud/overseer/SliceMutator.java index adcca56967e..63c37effe48 100644 --- a/solr/core/src/java/org/apache/solr/cloud/overseer/SliceMutator.java +++ b/solr/core/src/java/org/apache/solr/cloud/overseer/SliceMutator.java @@ -1,7 +1,3 @@ -package org.apache.solr.cloud.overseer; - -import java.lang.invoke.MethodHandles; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import java.lang.invoke.MethodHandles; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud.overseer; + +import java.lang.invoke.MethodHandles; import java.util.HashMap; import java.util.LinkedHashMap; diff --git a/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java b/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java index 78418daa230..9fb3ada40c6 100644 --- a/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java +++ b/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java @@ -1,5 +1,3 @@ -package org.apache.solr.cloud.overseer; - /* * 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.cloud.overseer; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud.overseer; import java.util.HashMap; import java.util.Map; diff --git a/solr/core/src/java/org/apache/solr/cloud/overseer/ZkWriteCommand.java b/solr/core/src/java/org/apache/solr/cloud/overseer/ZkWriteCommand.java index 2ef2998bed9..1697522e3c8 100644 --- a/solr/core/src/java/org/apache/solr/cloud/overseer/ZkWriteCommand.java +++ b/solr/core/src/java/org/apache/solr/cloud/overseer/ZkWriteCommand.java @@ -1,5 +1,3 @@ -package org.apache.solr.cloud.overseer; - /* * 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.cloud.overseer; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud.overseer; import org.apache.solr.common.cloud.DocCollection; diff --git a/solr/core/src/java/org/apache/solr/cloud/overseer/package-info.java b/solr/core/src/java/org/apache/solr/cloud/overseer/package-info.java index dbd3b1d6a79..d74ba9288d4 100644 --- a/solr/core/src/java/org/apache/solr/cloud/overseer/package-info.java +++ b/solr/core/src/java/org/apache/solr/cloud/overseer/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Classes for updating cluster state in SolrCloud mode. */ diff --git a/solr/core/src/java/org/apache/solr/cloud/package-info.java b/solr/core/src/java/org/apache/solr/cloud/package-info.java index 096d6faaa55..5c830c70334 100644 --- a/solr/core/src/java/org/apache/solr/cloud/package-info.java +++ b/solr/core/src/java/org/apache/solr/cloud/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Classes for dealing with ZooKeeper when operating in SolrCloud mode. */ diff --git a/solr/core/src/java/org/apache/solr/cloud/rule/ImplicitSnitch.java b/solr/core/src/java/org/apache/solr/cloud/rule/ImplicitSnitch.java index 37191a06bbe..cbaa90fd2e0 100644 --- a/solr/core/src/java/org/apache/solr/cloud/rule/ImplicitSnitch.java +++ b/solr/core/src/java/org/apache/solr/cloud/rule/ImplicitSnitch.java @@ -1,5 +1,3 @@ -package org.apache.solr.cloud.rule; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,7 +14,7 @@ package org.apache.solr.cloud.rule; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.cloud.rule; import java.io.IOException; import java.nio.file.Files; diff --git a/solr/core/src/java/org/apache/solr/cloud/rule/RemoteCallback.java b/solr/core/src/java/org/apache/solr/cloud/rule/RemoteCallback.java index 124519b1174..5b6987dcd9f 100644 --- a/solr/core/src/java/org/apache/solr/cloud/rule/RemoteCallback.java +++ b/solr/core/src/java/org/apache/solr/cloud/rule/RemoteCallback.java @@ -1,5 +1,3 @@ -package org.apache.solr.cloud.rule; - /* * 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.cloud.rule; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud.rule; import java.util.Map; diff --git a/solr/core/src/java/org/apache/solr/cloud/rule/ReplicaAssigner.java b/solr/core/src/java/org/apache/solr/cloud/rule/ReplicaAssigner.java index 2e2911198a8..f3f5b416779 100644 --- a/solr/core/src/java/org/apache/solr/cloud/rule/ReplicaAssigner.java +++ b/solr/core/src/java/org/apache/solr/cloud/rule/ReplicaAssigner.java @@ -1,7 +1,3 @@ -package org.apache.solr.cloud.rule; - -import java.lang.invoke.MethodHandles; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import java.lang.invoke.MethodHandles; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud.rule; + +import java.lang.invoke.MethodHandles; import java.util.ArrayList; import java.util.BitSet; diff --git a/solr/core/src/java/org/apache/solr/cloud/rule/Rule.java b/solr/core/src/java/org/apache/solr/cloud/rule/Rule.java index 51ef002d2c1..d73a9bf9671 100644 --- a/solr/core/src/java/org/apache/solr/cloud/rule/Rule.java +++ b/solr/core/src/java/org/apache/solr/cloud/rule/Rule.java @@ -1,5 +1,3 @@ -package org.apache.solr.cloud.rule; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,7 +14,7 @@ package org.apache.solr.cloud.rule; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.cloud.rule; import java.util.LinkedHashMap; import java.util.List; diff --git a/solr/core/src/java/org/apache/solr/cloud/rule/Snitch.java b/solr/core/src/java/org/apache/solr/cloud/rule/Snitch.java index 85a3596c54c..a469e199021 100644 --- a/solr/core/src/java/org/apache/solr/cloud/rule/Snitch.java +++ b/solr/core/src/java/org/apache/solr/cloud/rule/Snitch.java @@ -1,5 +1,3 @@ -package org.apache.solr.cloud.rule; - /* * 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.cloud.rule; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud.rule; import java.util.Set; diff --git a/solr/core/src/java/org/apache/solr/cloud/rule/SnitchContext.java b/solr/core/src/java/org/apache/solr/cloud/rule/SnitchContext.java index f648616c894..b8993da5508 100644 --- a/solr/core/src/java/org/apache/solr/cloud/rule/SnitchContext.java +++ b/solr/core/src/java/org/apache/solr/cloud/rule/SnitchContext.java @@ -1,5 +1,3 @@ -package org.apache.solr.cloud.rule; - /* * 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.cloud.rule; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud.rule; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/java/org/apache/solr/cloud/rule/package-info.java b/solr/core/src/java/org/apache/solr/cloud/rule/package-info.java index f4f0dd05fcc..b650a6005e0 100644 --- a/solr/core/src/java/org/apache/solr/cloud/rule/package-info.java +++ b/solr/core/src/java/org/apache/solr/cloud/rule/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Classes for managing Replica placement strategy when operating in SolrCloud mode. */ diff --git a/solr/core/src/java/org/apache/solr/core/AbstractSolrEventListener.java b/solr/core/src/java/org/apache/solr/core/AbstractSolrEventListener.java index 8a7101d01a0..83b2a93787f 100644 --- a/solr/core/src/java/org/apache/solr/core/AbstractSolrEventListener.java +++ b/solr/core/src/java/org/apache/solr/core/AbstractSolrEventListener.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.core; import org.apache.solr.common.util.NamedList; diff --git a/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java b/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java index dbb31d0bc50..b9fe8343b85 100644 --- a/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java +++ b/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.core; - /* * 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.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.core; import java.io.File; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/core/CloseHook.java b/solr/core/src/java/org/apache/solr/core/CloseHook.java index d59c179c6bc..812d89a9443 100644 --- a/solr/core/src/java/org/apache/solr/core/CloseHook.java +++ b/solr/core/src/java/org/apache/solr/core/CloseHook.java @@ -1,4 +1,3 @@ -package org.apache.solr.core; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,8 +14,7 @@ package org.apache.solr.core; * See the License for the specific language governing permissions and * limitations under the License. */ - - +package org.apache.solr.core; /** * Used to request notification when the core is closed. *

    diff --git a/solr/core/src/java/org/apache/solr/core/CloudConfig.java b/solr/core/src/java/org/apache/solr/core/CloudConfig.java index 78d913058be..ced04709508 100644 --- a/solr/core/src/java/org/apache/solr/core/CloudConfig.java +++ b/solr/core/src/java/org/apache/solr/core/CloudConfig.java @@ -1,5 +1,3 @@ -package org.apache.solr.core; - /* * 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.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.core; import org.apache.solr.common.SolrException; diff --git a/solr/core/src/java/org/apache/solr/core/CodecFactory.java b/solr/core/src/java/org/apache/solr/core/CodecFactory.java index 17c7d93f2e2..36c67eba145 100644 --- a/solr/core/src/java/org/apache/solr/core/CodecFactory.java +++ b/solr/core/src/java/org/apache/solr/core/CodecFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.core; - /* * 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.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.core; import org.apache.lucene.codecs.Codec; import org.apache.solr.common.util.NamedList; diff --git a/solr/core/src/java/org/apache/solr/core/Config.java b/solr/core/src/java/org/apache/solr/core/Config.java index f37719cf64f..a998c6f854a 100644 --- a/solr/core/src/java/org/apache/solr/core/Config.java +++ b/solr/core/src/java/org/apache/solr/core/Config.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.core; import javax.xml.namespace.QName; diff --git a/solr/core/src/java/org/apache/solr/core/ConfigOverlay.java b/solr/core/src/java/org/apache/solr/core/ConfigOverlay.java index 518695ce389..0252bd5e6b8 100644 --- a/solr/core/src/java/org/apache/solr/core/ConfigOverlay.java +++ b/solr/core/src/java/org/apache/solr/core/ConfigOverlay.java @@ -1,5 +1,3 @@ -package org.apache.solr.core; - /* * 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.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.core; import java.io.IOException; import java.io.StringReader; diff --git a/solr/core/src/java/org/apache/solr/core/ConfigSet.java b/solr/core/src/java/org/apache/solr/core/ConfigSet.java index dd0cdba1d39..c406506d2cf 100644 --- a/solr/core/src/java/org/apache/solr/core/ConfigSet.java +++ b/solr/core/src/java/org/apache/solr/core/ConfigSet.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.core; import org.apache.solr.common.util.NamedList; diff --git a/solr/core/src/java/org/apache/solr/core/ConfigSetProperties.java b/solr/core/src/java/org/apache/solr/core/ConfigSetProperties.java index 8fd9595c940..ca768edc124 100644 --- a/solr/core/src/java/org/apache/solr/core/ConfigSetProperties.java +++ b/solr/core/src/java/org/apache/solr/core/ConfigSetProperties.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.core; import java.io.InputStreamReader; diff --git a/solr/core/src/java/org/apache/solr/core/ConfigSetService.java b/solr/core/src/java/org/apache/solr/core/ConfigSetService.java index 229895a660b..ac0cabd8827 100644 --- a/solr/core/src/java/org/apache/solr/core/ConfigSetService.java +++ b/solr/core/src/java/org/apache/solr/core/ConfigSetService.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.core; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/core/CoreContainer.java b/solr/core/src/java/org/apache/solr/core/CoreContainer.java index 95c852039b4..bca7e6c3f24 100644 --- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java +++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.core; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/core/CoreDescriptor.java b/solr/core/src/java/org/apache/solr/core/CoreDescriptor.java index dd6dc980af4..d2e95580131 100644 --- a/solr/core/src/java/org/apache/solr/core/CoreDescriptor.java +++ b/solr/core/src/java/org/apache/solr/core/CoreDescriptor.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.core; import java.io.File; diff --git a/solr/core/src/java/org/apache/solr/core/CorePropertiesLocator.java b/solr/core/src/java/org/apache/solr/core/CorePropertiesLocator.java index bf9172feee7..30038c5dfca 100644 --- a/solr/core/src/java/org/apache/solr/core/CorePropertiesLocator.java +++ b/solr/core/src/java/org/apache/solr/core/CorePropertiesLocator.java @@ -1,5 +1,3 @@ -package org.apache.solr.core; - /* * 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.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.core; import java.io.IOException; import java.io.InputStream; diff --git a/solr/core/src/java/org/apache/solr/core/CoresLocator.java b/solr/core/src/java/org/apache/solr/core/CoresLocator.java index daeef04b88b..d4f40cd414e 100644 --- a/solr/core/src/java/org/apache/solr/core/CoresLocator.java +++ b/solr/core/src/java/org/apache/solr/core/CoresLocator.java @@ -1,5 +1,3 @@ -package org.apache.solr.core; - /* * 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.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.core; import java.util.List; diff --git a/solr/core/src/java/org/apache/solr/core/Diagnostics.java b/solr/core/src/java/org/apache/solr/core/Diagnostics.java index d9dccfc72f2..d7d6178cce4 100644 --- a/solr/core/src/java/org/apache/solr/core/Diagnostics.java +++ b/solr/core/src/java/org/apache/solr/core/Diagnostics.java @@ -1,4 +1,3 @@ -package org.apache.solr.core; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,8 +14,7 @@ package org.apache.solr.core; * See the License for the specific language governing permissions and * limitations under the License. */ - - +package org.apache.solr.core; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/solr/core/src/java/org/apache/solr/core/DirectoryFactory.java b/solr/core/src/java/org/apache/solr/core/DirectoryFactory.java index 715b6a6295e..99c35832ea7 100644 --- a/solr/core/src/java/org/apache/solr/core/DirectoryFactory.java +++ b/solr/core/src/java/org/apache/solr/core/DirectoryFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.core; - /* * 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.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.core; import java.io.Closeable; import java.io.File; diff --git a/solr/core/src/java/org/apache/solr/core/EphemeralDirectoryFactory.java b/solr/core/src/java/org/apache/solr/core/EphemeralDirectoryFactory.java index f7f58097ce4..cee7860cf2e 100644 --- a/solr/core/src/java/org/apache/solr/core/EphemeralDirectoryFactory.java +++ b/solr/core/src/java/org/apache/solr/core/EphemeralDirectoryFactory.java @@ -1,4 +1,3 @@ -package org.apache.solr.core; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.core; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.core; import java.io.IOException; import org.apache.lucene.store.Directory; diff --git a/solr/core/src/java/org/apache/solr/core/HdfsDirectoryFactory.java b/solr/core/src/java/org/apache/solr/core/HdfsDirectoryFactory.java index 56c9cbae602..0d53667afa0 100644 --- a/solr/core/src/java/org/apache/solr/core/HdfsDirectoryFactory.java +++ b/solr/core/src/java/org/apache/solr/core/HdfsDirectoryFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.core; - /* * 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.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.core; import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION; diff --git a/solr/core/src/java/org/apache/solr/core/ImplicitPlugins.java b/solr/core/src/java/org/apache/solr/core/ImplicitPlugins.java index a8337600a22..f6a74dae94a 100644 --- a/solr/core/src/java/org/apache/solr/core/ImplicitPlugins.java +++ b/solr/core/src/java/org/apache/solr/core/ImplicitPlugins.java @@ -1,5 +1,3 @@ -package org.apache.solr.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,7 +14,7 @@ package org.apache.solr.core; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.core; import java.util.ArrayList; import java.util.Collections; diff --git a/solr/core/src/java/org/apache/solr/core/IndexDeletionPolicyWrapper.java b/solr/core/src/java/org/apache/solr/core/IndexDeletionPolicyWrapper.java index c677fc2a2ee..207c0e5d2a0 100644 --- a/solr/core/src/java/org/apache/solr/core/IndexDeletionPolicyWrapper.java +++ b/solr/core/src/java/org/apache/solr/core/IndexDeletionPolicyWrapper.java @@ -1,4 +1,3 @@ -package org.apache.solr.core; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.core; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.core; import org.apache.lucene.index.IndexCommit; import org.apache.lucene.index.IndexDeletionPolicy; import org.apache.lucene.index.IndexWriter; diff --git a/solr/core/src/java/org/apache/solr/core/IndexReaderFactory.java b/solr/core/src/java/org/apache/solr/core/IndexReaderFactory.java index 7576bfe335d..03e73b7c851 100644 --- a/solr/core/src/java/org/apache/solr/core/IndexReaderFactory.java +++ b/solr/core/src/java/org/apache/solr/core/IndexReaderFactory.java @@ -1,4 +1,3 @@ -package org.apache.solr.core; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.core; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.core; import java.io.IOException; import org.apache.lucene.index.DirectoryReader; diff --git a/solr/core/src/java/org/apache/solr/core/InitParams.java b/solr/core/src/java/org/apache/solr/core/InitParams.java index af0a9efce75..d79dfeaa750 100644 --- a/solr/core/src/java/org/apache/solr/core/InitParams.java +++ b/solr/core/src/java/org/apache/solr/core/InitParams.java @@ -1,5 +1,3 @@ -package org.apache.solr.core; - /* * 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.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.core; import java.util.Collections; import java.util.HashSet; diff --git a/solr/core/src/java/org/apache/solr/core/JarRepository.java b/solr/core/src/java/org/apache/solr/core/JarRepository.java index 3cda89cde6d..c760b594927 100644 --- a/solr/core/src/java/org/apache/solr/core/JarRepository.java +++ b/solr/core/src/java/org/apache/solr/core/JarRepository.java @@ -1,5 +1,3 @@ -package org.apache.solr.core; - /* * 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.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.core; import static org.apache.solr.common.SolrException.ErrorCode.SERVICE_UNAVAILABLE; import static org.apache.solr.common.cloud.ZkStateReader.BASE_URL_PROP; diff --git a/solr/core/src/java/org/apache/solr/core/MMapDirectoryFactory.java b/solr/core/src/java/org/apache/solr/core/MMapDirectoryFactory.java index 8543a7b54ec..c68ae62cf0e 100644 --- a/solr/core/src/java/org/apache/solr/core/MMapDirectoryFactory.java +++ b/solr/core/src/java/org/apache/solr/core/MMapDirectoryFactory.java @@ -1,4 +1,3 @@ -package org.apache.solr.core; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,8 +14,7 @@ package org.apache.solr.core; * See the License for the specific language governing permissions and * limitations under the License. */ - - +package org.apache.solr.core; import java.io.File; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/java/org/apache/solr/core/MapSerializable.java b/solr/core/src/java/org/apache/solr/core/MapSerializable.java index e5348080c21..6ebcdfdb852 100644 --- a/solr/core/src/java/org/apache/solr/core/MapSerializable.java +++ b/solr/core/src/java/org/apache/solr/core/MapSerializable.java @@ -1,5 +1,3 @@ -package org.apache.solr.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,7 +14,7 @@ package org.apache.solr.core; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.core; import java.util.Map; diff --git a/solr/core/src/java/org/apache/solr/core/MemClassLoader.java b/solr/core/src/java/org/apache/solr/core/MemClassLoader.java index c550ea5050b..4df0a8b4356 100644 --- a/solr/core/src/java/org/apache/solr/core/MemClassLoader.java +++ b/solr/core/src/java/org/apache/solr/core/MemClassLoader.java @@ -1,5 +1,3 @@ -package org.apache.solr.core; - /* * 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.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.core; import java.io.IOException; import java.io.InputStream; diff --git a/solr/core/src/java/org/apache/solr/core/NIOFSDirectoryFactory.java b/solr/core/src/java/org/apache/solr/core/NIOFSDirectoryFactory.java index 96027fdc38d..459b12e93c6 100644 --- a/solr/core/src/java/org/apache/solr/core/NIOFSDirectoryFactory.java +++ b/solr/core/src/java/org/apache/solr/core/NIOFSDirectoryFactory.java @@ -1,4 +1,3 @@ -package org.apache.solr.core; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.core; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.core; import java.io.File; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/core/NRTCachingDirectoryFactory.java b/solr/core/src/java/org/apache/solr/core/NRTCachingDirectoryFactory.java index 59ac10585c4..4ecc44cdfd5 100644 --- a/solr/core/src/java/org/apache/solr/core/NRTCachingDirectoryFactory.java +++ b/solr/core/src/java/org/apache/solr/core/NRTCachingDirectoryFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.core; import java.io.File; diff --git a/solr/core/src/java/org/apache/solr/core/NodeConfig.java b/solr/core/src/java/org/apache/solr/core/NodeConfig.java index 3fb64473751..546f27c5f0a 100644 --- a/solr/core/src/java/org/apache/solr/core/NodeConfig.java +++ b/solr/core/src/java/org/apache/solr/core/NodeConfig.java @@ -1,5 +1,3 @@ -package org.apache.solr.core; - /* * 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.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.core; import java.nio.file.Path; import java.util.Properties; diff --git a/solr/core/src/java/org/apache/solr/core/PluginBag.java b/solr/core/src/java/org/apache/solr/core/PluginBag.java index a1e02808b61..454633de5a1 100644 --- a/solr/core/src/java/org/apache/solr/core/PluginBag.java +++ b/solr/core/src/java/org/apache/solr/core/PluginBag.java @@ -1,5 +1,3 @@ -package org.apache.solr.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,7 +14,7 @@ package org.apache.solr.core; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.core; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/java/org/apache/solr/core/QuerySenderListener.java b/solr/core/src/java/org/apache/solr/core/QuerySenderListener.java index cc2cc0f9aba..f3c1b4e50ba 100644 --- a/solr/core/src/java/org/apache/solr/core/QuerySenderListener.java +++ b/solr/core/src/java/org/apache/solr/core/QuerySenderListener.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.core; import org.apache.solr.request.SolrQueryRequest; diff --git a/solr/core/src/java/org/apache/solr/core/RAMDirectoryFactory.java b/solr/core/src/java/org/apache/solr/core/RAMDirectoryFactory.java index 1fd526b03a2..25d0a1c0f7c 100644 --- a/solr/core/src/java/org/apache/solr/core/RAMDirectoryFactory.java +++ b/solr/core/src/java/org/apache/solr/core/RAMDirectoryFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.core; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/core/RequestHandlers.java b/solr/core/src/java/org/apache/solr/core/RequestHandlers.java index a74153feee5..d2fbdf98b78 100644 --- a/solr/core/src/java/org/apache/solr/core/RequestHandlers.java +++ b/solr/core/src/java/org/apache/solr/core/RequestHandlers.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.core; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/java/org/apache/solr/core/RequestParams.java b/solr/core/src/java/org/apache/solr/core/RequestParams.java index 090569210ba..d27a1c661ef 100644 --- a/solr/core/src/java/org/apache/solr/core/RequestParams.java +++ b/solr/core/src/java/org/apache/solr/core/RequestParams.java @@ -1,5 +1,3 @@ -package org.apache.solr.core; - /* * 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.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.core; import java.io.IOException; import java.io.InputStream; diff --git a/solr/core/src/java/org/apache/solr/core/RunExecutableListener.java b/solr/core/src/java/org/apache/solr/core/RunExecutableListener.java index 024075ddd94..ba0046e4089 100644 --- a/solr/core/src/java/org/apache/solr/core/RunExecutableListener.java +++ b/solr/core/src/java/org/apache/solr/core/RunExecutableListener.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.core; import org.apache.solr.common.SolrException; diff --git a/solr/core/src/java/org/apache/solr/core/SchemaCodecFactory.java b/solr/core/src/java/org/apache/solr/core/SchemaCodecFactory.java index 12b33213da4..dc423d99212 100644 --- a/solr/core/src/java/org/apache/solr/core/SchemaCodecFactory.java +++ b/solr/core/src/java/org/apache/solr/core/SchemaCodecFactory.java @@ -1,3 +1,19 @@ +/* + * 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.core; import java.lang.invoke.MethodHandles; @@ -17,23 +33,6 @@ import org.apache.solr.util.plugin.SolrCoreAware; 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. - */ - /** * Per-field CodecFactory implementation, extends Lucene's * and returns postings format implementations according to the diff --git a/solr/core/src/java/org/apache/solr/core/SimpleFSDirectoryFactory.java b/solr/core/src/java/org/apache/solr/core/SimpleFSDirectoryFactory.java index 304fca22fd1..f2413c9ac08 100644 --- a/solr/core/src/java/org/apache/solr/core/SimpleFSDirectoryFactory.java +++ b/solr/core/src/java/org/apache/solr/core/SimpleFSDirectoryFactory.java @@ -1,4 +1,3 @@ -package org.apache.solr.core; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.core; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.core; import java.io.File; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/core/SolrConfig.java b/solr/core/src/java/org/apache/solr/core/SolrConfig.java index df1d39a30b0..e66fc7e7404 100644 --- a/solr/core/src/java/org/apache/solr/core/SolrConfig.java +++ b/solr/core/src/java/org/apache/solr/core/SolrConfig.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.core; diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.java index 595bedae06b..70954d5c851 100644 --- a/solr/core/src/java/org/apache/solr/core/SolrCore.java +++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.core; import java.io.Closeable; diff --git a/solr/core/src/java/org/apache/solr/core/SolrCores.java b/solr/core/src/java/org/apache/solr/core/SolrCores.java index 38df2b18404..3d01d63198b 100644 --- a/solr/core/src/java/org/apache/solr/core/SolrCores.java +++ b/solr/core/src/java/org/apache/solr/core/SolrCores.java @@ -1,5 +1,3 @@ -package org.apache.solr.core; - /* * 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.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.core; import com.google.common.collect.Lists; import org.apache.solr.common.SolrException; diff --git a/solr/core/src/java/org/apache/solr/core/SolrDeletionPolicy.java b/solr/core/src/java/org/apache/solr/core/SolrDeletionPolicy.java index 5779669fd2d..24b0e610d30 100644 --- a/solr/core/src/java/org/apache/solr/core/SolrDeletionPolicy.java +++ b/solr/core/src/java/org/apache/solr/core/SolrDeletionPolicy.java @@ -1,4 +1,3 @@ -package org.apache.solr.core; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.core; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.core; import org.apache.lucene.index.IndexCommit; import org.apache.lucene.index.IndexDeletionPolicy; import org.apache.lucene.store.Directory; diff --git a/solr/core/src/java/org/apache/solr/core/SolrEventListener.java b/solr/core/src/java/org/apache/solr/core/SolrEventListener.java index fb78e53f5f1..ab1d48554a9 100644 --- a/solr/core/src/java/org/apache/solr/core/SolrEventListener.java +++ b/solr/core/src/java/org/apache/solr/core/SolrEventListener.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.core; import org.apache.solr.search.SolrIndexSearcher; diff --git a/solr/core/src/java/org/apache/solr/core/SolrInfoMBean.java b/solr/core/src/java/org/apache/solr/core/SolrInfoMBean.java index ac6137a9d81..c119e2f42ba 100644 --- a/solr/core/src/java/org/apache/solr/core/SolrInfoMBean.java +++ b/solr/core/src/java/org/apache/solr/core/SolrInfoMBean.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.core; import java.net.URL; diff --git a/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java b/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java index ee70e95ae53..5db04ca7356 100644 --- a/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java +++ b/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.core; import javax.naming.Context; diff --git a/solr/core/src/java/org/apache/solr/core/SolrResourceNotFoundException.java b/solr/core/src/java/org/apache/solr/core/SolrResourceNotFoundException.java index 5213c0ab5d2..47a863b7b96 100644 --- a/solr/core/src/java/org/apache/solr/core/SolrResourceNotFoundException.java +++ b/solr/core/src/java/org/apache/solr/core/SolrResourceNotFoundException.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.core; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java b/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java index 127aa1e6f8d..96a59353b58 100644 --- a/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java +++ b/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java @@ -1,5 +1,3 @@ -package org.apache.solr.core; - /* * 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.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.core; import javax.xml.xpath.XPath; import javax.xml.xpath.XPathConstants; diff --git a/solr/core/src/java/org/apache/solr/core/StandardDirectoryFactory.java b/solr/core/src/java/org/apache/solr/core/StandardDirectoryFactory.java index 73d6e6eec55..532655bc30e 100644 --- a/solr/core/src/java/org/apache/solr/core/StandardDirectoryFactory.java +++ b/solr/core/src/java/org/apache/solr/core/StandardDirectoryFactory.java @@ -1,4 +1,3 @@ -package org.apache.solr.core; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.core; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.core; import java.io.File; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/java/org/apache/solr/core/StandardIndexReaderFactory.java b/solr/core/src/java/org/apache/solr/core/StandardIndexReaderFactory.java index d44cfcb8ca2..71cb012ae97 100644 --- a/solr/core/src/java/org/apache/solr/core/StandardIndexReaderFactory.java +++ b/solr/core/src/java/org/apache/solr/core/StandardIndexReaderFactory.java @@ -1,4 +1,3 @@ -package org.apache.solr.core; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.core; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.core; import java.io.IOException; import org.apache.lucene.index.DirectoryReader; diff --git a/solr/core/src/java/org/apache/solr/core/ZkContainer.java b/solr/core/src/java/org/apache/solr/core/ZkContainer.java index 138414753ee..0daafd6b9ac 100644 --- a/solr/core/src/java/org/apache/solr/core/ZkContainer.java +++ b/solr/core/src/java/org/apache/solr/core/ZkContainer.java @@ -1,5 +1,3 @@ -package org.apache.solr.core; - /* * 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.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.core; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/java/org/apache/solr/core/package-info.java b/solr/core/src/java/org/apache/solr/core/package-info.java index 6fd201f5268..b80f2725da7 100644 --- a/solr/core/src/java/org/apache/solr/core/package-info.java +++ b/solr/core/src/java/org/apache/solr/core/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Core classes implementin Solr internals and the management of {@link org.apache.solr.core.SolrCore}s */ diff --git a/solr/core/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java b/solr/core/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java index dd3f9e5bf78..d7cfc45dce4 100644 --- a/solr/core/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java +++ b/solr/core/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/handler/BlobHandler.java b/solr/core/src/java/org/apache/solr/handler/BlobHandler.java index f08af9ed17e..9a967306c25 100644 --- a/solr/core/src/java/org/apache/solr/handler/BlobHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/BlobHandler.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 @@ -16,6 +14,7 @@ package org.apache.solr.handler; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler; import java.io.IOException; import java.io.OutputStream; diff --git a/solr/core/src/java/org/apache/solr/handler/CdcrBufferManager.java b/solr/core/src/java/org/apache/solr/handler/CdcrBufferManager.java index fcedace6029..86963796c25 100644 --- a/solr/core/src/java/org/apache/solr/handler/CdcrBufferManager.java +++ b/solr/core/src/java/org/apache/solr/handler/CdcrBufferManager.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 @@ -16,6 +14,7 @@ package org.apache.solr.handler; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler; import org.apache.solr.core.SolrCore; import org.apache.solr.update.CdcrUpdateLog; diff --git a/solr/core/src/java/org/apache/solr/handler/CdcrBufferStateManager.java b/solr/core/src/java/org/apache/solr/handler/CdcrBufferStateManager.java index b4e137e0dfe..18c7d057188 100644 --- a/solr/core/src/java/org/apache/solr/handler/CdcrBufferStateManager.java +++ b/solr/core/src/java/org/apache/solr/handler/CdcrBufferStateManager.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 @@ -16,6 +14,7 @@ package org.apache.solr.handler; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler; import org.apache.solr.common.cloud.SolrZkClient; import org.apache.solr.common.params.SolrParams; diff --git a/solr/core/src/java/org/apache/solr/handler/CdcrLeaderStateManager.java b/solr/core/src/java/org/apache/solr/handler/CdcrLeaderStateManager.java index 381227c8ee2..59313d333ea 100644 --- a/solr/core/src/java/org/apache/solr/handler/CdcrLeaderStateManager.java +++ b/solr/core/src/java/org/apache/solr/handler/CdcrLeaderStateManager.java @@ -1,7 +1,3 @@ -package org.apache.solr.handler; - -import java.lang.invoke.MethodHandles; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import java.lang.invoke.MethodHandles; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler; + +import java.lang.invoke.MethodHandles; import org.apache.solr.common.cloud.ClusterState; import org.apache.solr.common.cloud.SolrZkClient; diff --git a/solr/core/src/java/org/apache/solr/handler/CdcrParams.java b/solr/core/src/java/org/apache/solr/handler/CdcrParams.java index 9f601d9b6f9..aa1d5bfb553 100644 --- a/solr/core/src/java/org/apache/solr/handler/CdcrParams.java +++ b/solr/core/src/java/org/apache/solr/handler/CdcrParams.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 @@ -16,6 +14,7 @@ package org.apache.solr.handler; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler; import java.nio.charset.Charset; import java.util.Locale; diff --git a/solr/core/src/java/org/apache/solr/handler/CdcrProcessStateManager.java b/solr/core/src/java/org/apache/solr/handler/CdcrProcessStateManager.java index 140ff2cbfa4..7630702db46 100644 --- a/solr/core/src/java/org/apache/solr/handler/CdcrProcessStateManager.java +++ b/solr/core/src/java/org/apache/solr/handler/CdcrProcessStateManager.java @@ -1,7 +1,3 @@ -package org.apache.solr.handler; - -import java.lang.invoke.MethodHandles; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import java.lang.invoke.MethodHandles; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler; + +import java.lang.invoke.MethodHandles; import org.apache.solr.common.cloud.SolrZkClient; import org.apache.solr.core.SolrCore; diff --git a/solr/core/src/java/org/apache/solr/handler/CdcrReplicator.java b/solr/core/src/java/org/apache/solr/handler/CdcrReplicator.java index af9f3ef7cd3..66ce0966768 100644 --- a/solr/core/src/java/org/apache/solr/handler/CdcrReplicator.java +++ b/solr/core/src/java/org/apache/solr/handler/CdcrReplicator.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 @@ -16,6 +14,7 @@ package org.apache.solr.handler; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler; import org.apache.solr.client.solrj.SolrServerException; import org.apache.solr.client.solrj.impl.CloudSolrClient; diff --git a/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorManager.java b/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorManager.java index 1555a209275..2822e609ae2 100644 --- a/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorManager.java +++ b/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorManager.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 @@ -16,6 +14,7 @@ package org.apache.solr.handler; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler; import org.apache.solr.client.solrj.SolrRequest; import org.apache.solr.client.solrj.SolrServerException; diff --git a/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorScheduler.java b/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorScheduler.java index c791cd0590b..2cbc1ab2da4 100644 --- a/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorScheduler.java +++ b/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorScheduler.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 @@ -16,6 +14,7 @@ package org.apache.solr.handler; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler; import org.apache.solr.common.params.SolrParams; import org.apache.solr.common.util.ExecutorUtil; diff --git a/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorState.java b/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorState.java index a2c2e283fac..d0b1c4a1152 100644 --- a/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorState.java +++ b/solr/core/src/java/org/apache/solr/handler/CdcrReplicatorState.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 @@ -16,6 +14,7 @@ package org.apache.solr.handler; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler; import org.apache.solr.client.solrj.impl.CloudSolrClient; import org.apache.solr.update.CdcrUpdateLog; diff --git a/solr/core/src/java/org/apache/solr/handler/CdcrRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/CdcrRequestHandler.java index a9fef59057e..585c8396d23 100644 --- a/solr/core/src/java/org/apache/solr/handler/CdcrRequestHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/CdcrRequestHandler.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 @@ -16,6 +14,7 @@ package org.apache.solr.handler; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/java/org/apache/solr/handler/CdcrStateManager.java b/solr/core/src/java/org/apache/solr/handler/CdcrStateManager.java index 0d0ed02ba24..151615e9e4f 100644 --- a/solr/core/src/java/org/apache/solr/handler/CdcrStateManager.java +++ b/solr/core/src/java/org/apache/solr/handler/CdcrStateManager.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 @@ -16,6 +14,7 @@ package org.apache.solr.handler; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler; import java.util.ArrayList; import java.util.List; diff --git a/solr/core/src/java/org/apache/solr/handler/CdcrUpdateLogSynchronizer.java b/solr/core/src/java/org/apache/solr/handler/CdcrUpdateLogSynchronizer.java index 31ad1b998b4..4955992a938 100644 --- a/solr/core/src/java/org/apache/solr/handler/CdcrUpdateLogSynchronizer.java +++ b/solr/core/src/java/org/apache/solr/handler/CdcrUpdateLogSynchronizer.java @@ -1,11 +1,3 @@ -package org.apache.solr.handler; - -import java.io.IOException; -import java.lang.invoke.MethodHandles; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -22,6 +14,13 @@ import java.util.concurrent.TimeUnit; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler; + +import java.io.IOException; +import java.lang.invoke.MethodHandles; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; import org.apache.solr.client.solrj.SolrRequest; import org.apache.solr.client.solrj.SolrServerException; diff --git a/solr/core/src/java/org/apache/solr/handler/ContentStreamHandlerBase.java b/solr/core/src/java/org/apache/solr/handler/ContentStreamHandlerBase.java index e44e74ce064..18379142d54 100644 --- a/solr/core/src/java/org/apache/solr/handler/ContentStreamHandlerBase.java +++ b/solr/core/src/java/org/apache/solr/handler/ContentStreamHandlerBase.java @@ -1,4 +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 @@ -15,7 +14,7 @@ package org.apache.solr.handler; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.handler; import org.apache.solr.common.SolrException; import org.apache.solr.common.params.SolrParams; import org.apache.solr.common.params.UpdateParams; diff --git a/solr/core/src/java/org/apache/solr/handler/ContentStreamLoader.java b/solr/core/src/java/org/apache/solr/handler/ContentStreamLoader.java index dd980d14568..8632eae6837 100644 --- a/solr/core/src/java/org/apache/solr/handler/ContentStreamLoader.java +++ b/solr/core/src/java/org/apache/solr/handler/ContentStreamLoader.java @@ -1,4 +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 @@ -15,8 +14,7 @@ package org.apache.solr.handler; * See the License for the specific language governing permissions and * limitations under the License. */ - - +package org.apache.solr.handler; import org.apache.solr.common.util.ContentStream; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.response.SolrQueryResponse; diff --git a/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java index a0ae288891c..4125aa9832c 100644 --- a/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler; import javax.xml.stream.XMLInputFactory; diff --git a/solr/core/src/java/org/apache/solr/handler/DumpRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/DumpRequestHandler.java index 9a84b2ece09..9b0f9599c8d 100644 --- a/solr/core/src/java/org/apache/solr/handler/DumpRequestHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/DumpRequestHandler.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java index 7ec3aac5897..7198b59f2d9 100644 --- a/solr/core/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler; import org.apache.lucene.util.BytesRef; diff --git a/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java b/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java index 9040a26887f..ad28911e408 100644 --- a/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/handler/NestedRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/NestedRequestHandler.java index 89dfe2d2519..d940974d99c 100644 --- a/solr/core/src/java/org/apache/solr/handler/NestedRequestHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/NestedRequestHandler.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 @@ -16,6 +14,7 @@ package org.apache.solr.handler; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler; import org.apache.solr.request.SolrRequestHandler; diff --git a/solr/core/src/java/org/apache/solr/handler/NotFoundRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/NotFoundRequestHandler.java index e402e9413e6..511edbe98dd 100644 --- a/solr/core/src/java/org/apache/solr/handler/NotFoundRequestHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/NotFoundRequestHandler.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 @@ -16,6 +14,7 @@ package org.apache.solr.handler; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler; import org.apache.solr.common.SolrException; import org.apache.solr.request.SolrQueryRequest; diff --git a/solr/core/src/java/org/apache/solr/handler/OldBackupDirectory.java b/solr/core/src/java/org/apache/solr/handler/OldBackupDirectory.java index c4b86c7eddf..7fd0fec8b8d 100644 --- a/solr/core/src/java/org/apache/solr/handler/OldBackupDirectory.java +++ b/solr/core/src/java/org/apache/solr/handler/OldBackupDirectory.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 @@ -16,6 +14,7 @@ package org.apache.solr.handler; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler; import java.io.File; import java.text.SimpleDateFormat; diff --git a/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java index b4e0fc3d1c7..426bb1aa453 100644 --- a/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler; import java.io.File; diff --git a/solr/core/src/java/org/apache/solr/handler/RealTimeGetHandler.java b/solr/core/src/java/org/apache/solr/handler/RealTimeGetHandler.java index 08e0ea69612..fd30d9fbdc1 100644 --- a/solr/core/src/java/org/apache/solr/handler/RealTimeGetHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/RealTimeGetHandler.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler; import org.apache.solr.handler.component.*; diff --git a/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java b/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java index 0b165559da4..cf3aa706dfa 100644 --- a/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java +++ b/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler; import org.apache.solr.common.SolrException; diff --git a/solr/core/src/java/org/apache/solr/handler/RequestHandlerUtils.java b/solr/core/src/java/org/apache/solr/handler/RequestHandlerUtils.java index 2266b71b9e1..99f83157ee2 100644 --- a/solr/core/src/java/org/apache/solr/handler/RequestHandlerUtils.java +++ b/solr/core/src/java/org/apache/solr/handler/RequestHandlerUtils.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/handler/RestoreCore.java b/solr/core/src/java/org/apache/solr/handler/RestoreCore.java index d6a7e1ddf92..086985c7617 100644 --- a/solr/core/src/java/org/apache/solr/handler/RestoreCore.java +++ b/solr/core/src/java/org/apache/solr/handler/RestoreCore.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 @@ -16,6 +14,7 @@ package org.apache.solr.handler; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/java/org/apache/solr/handler/SQLHandler.java b/solr/core/src/java/org/apache/solr/handler/SQLHandler.java index 49178bd4e37..8324c8528f9 100644 --- a/solr/core/src/java/org/apache/solr/handler/SQLHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/SQLHandler.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 @@ -16,6 +14,7 @@ package org.apache.solr.handler; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/java/org/apache/solr/handler/SchemaHandler.java b/solr/core/src/java/org/apache/solr/handler/SchemaHandler.java index 61ee8d87940..67d6610f5f8 100644 --- a/solr/core/src/java/org/apache/solr/handler/SchemaHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/SchemaHandler.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 @@ -16,7 +14,7 @@ package org.apache.solr.handler; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.handler; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java b/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java index 7cc11170604..e862e054bb0 100644 --- a/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.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 @@ -16,7 +14,7 @@ package org.apache.solr.handler; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.handler; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/java/org/apache/solr/handler/StandardRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/StandardRequestHandler.java index 04bbe6948c9..53a8397ce55 100644 --- a/solr/core/src/java/org/apache/solr/handler/StandardRequestHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/StandardRequestHandler.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler; import org.apache.solr.handler.component.*; diff --git a/solr/core/src/java/org/apache/solr/handler/StreamHandler.java b/solr/core/src/java/org/apache/solr/handler/StreamHandler.java index 7b4fd4ca9df..de38c9b2354 100644 --- a/solr/core/src/java/org/apache/solr/handler/StreamHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/StreamHandler.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/handler/UpdateRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/UpdateRequestHandler.java index ed3090d39ce..b8d2a89644f 100644 --- a/solr/core/src/java/org/apache/solr/handler/UpdateRequestHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/UpdateRequestHandler.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler; import java.util.Collections; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/AdminHandlers.java b/solr/core/src/java/org/apache/solr/handler/admin/AdminHandlers.java index 73b72ecf261..1965a505124 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/AdminHandlers.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/AdminHandlers.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.admin; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/ClusterStatus.java b/solr/core/src/java/org/apache/solr/handler/admin/ClusterStatus.java index cf3d61c29bb..667d9fa11f5 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/ClusterStatus.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/ClusterStatus.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.admin; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,7 +14,7 @@ package org.apache.solr.handler.admin; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.handler.admin; import java.util.ArrayList; import java.util.Collection; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/ConfigSetsHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/ConfigSetsHandler.java index b339436a045..4db2950c676 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/ConfigSetsHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/ConfigSetsHandler.java @@ -1,7 +1,3 @@ -package org.apache.solr.handler.admin; - -import java.lang.invoke.MethodHandles; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import java.lang.invoke.MethodHandles; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.admin; + +import java.lang.invoke.MethodHandles; import java.util.Iterator; import java.util.List; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java index fdb0129ea9f..c8616fbd88c 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.admin; import java.io.File; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminOperation.java b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminOperation.java index 65c95a128c7..4579ee7d4f2 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminOperation.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminOperation.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.admin; - /* * 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.handler.admin; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.admin; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/InfoHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/InfoHandler.java index d24a59b0b8f..9c437ab67f5 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/InfoHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/InfoHandler.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.admin; - /* * 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.handler.admin; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.admin; import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException.ErrorCode; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/LoggingHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/LoggingHandler.java index 2014c219776..a56159409e5 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/LoggingHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/LoggingHandler.java @@ -6,7 +6,7 @@ * (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 + * 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, @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.admin; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java index 329b7a1cb76..4e497780e6e 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.admin; import static org.apache.lucene.index.IndexOptions.DOCS; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java index c2f4cd74f55..6bc34ed3cb7 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.admin; import java.net.URL; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java index 52fde6aabbd..bae61a7316c 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.admin; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/RebalanceLeaders.java b/solr/core/src/java/org/apache/solr/handler/admin/RebalanceLeaders.java index b7925fb1c7a..4626fc92967 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/RebalanceLeaders.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/RebalanceLeaders.java @@ -1,20 +1,3 @@ -package org.apache.solr.handler.admin; - -import static org.apache.solr.cloud.Overseer.QUEUE_OPERATION; -import static org.apache.solr.common.cloud.ZkStateReader.COLLECTION_PROP; -import static org.apache.solr.common.cloud.ZkStateReader.CORE_NAME_PROP; -import static org.apache.solr.common.cloud.ZkStateReader.CORE_NODE_NAME_PROP; -import static org.apache.solr.common.cloud.ZkStateReader.ELECTION_NODE_PROP; -import static org.apache.solr.common.cloud.ZkStateReader.LEADER_PROP; -import static org.apache.solr.common.cloud.ZkStateReader.MAX_AT_ONCE_PROP; -import static org.apache.solr.common.cloud.ZkStateReader.MAX_WAIT_SECONDS_PROP; -import static org.apache.solr.common.cloud.ZkStateReader.REJOIN_AT_HEAD_PROP; -import static org.apache.solr.common.cloud.ZkStateReader.SHARD_ID_PROP; -import static org.apache.solr.common.params.CollectionParams.CollectionAction.REBALANCELEADERS; -import static org.apache.solr.common.params.CommonAdminParams.ASYNC; - -import java.lang.invoke.MethodHandles; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -31,6 +14,22 @@ import java.lang.invoke.MethodHandles; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.admin; + +import static org.apache.solr.cloud.Overseer.QUEUE_OPERATION; +import static org.apache.solr.common.cloud.ZkStateReader.COLLECTION_PROP; +import static org.apache.solr.common.cloud.ZkStateReader.CORE_NAME_PROP; +import static org.apache.solr.common.cloud.ZkStateReader.CORE_NODE_NAME_PROP; +import static org.apache.solr.common.cloud.ZkStateReader.ELECTION_NODE_PROP; +import static org.apache.solr.common.cloud.ZkStateReader.LEADER_PROP; +import static org.apache.solr.common.cloud.ZkStateReader.MAX_AT_ONCE_PROP; +import static org.apache.solr.common.cloud.ZkStateReader.MAX_WAIT_SECONDS_PROP; +import static org.apache.solr.common.cloud.ZkStateReader.REJOIN_AT_HEAD_PROP; +import static org.apache.solr.common.cloud.ZkStateReader.SHARD_ID_PROP; +import static org.apache.solr.common.params.CollectionParams.CollectionAction.REBALANCELEADERS; +import static org.apache.solr.common.params.CommonAdminParams.ASYNC; + +import java.lang.invoke.MethodHandles; import java.util.HashMap; import java.util.Iterator; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/SecurityConfHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/SecurityConfHandler.java index f61a852a80d..285ea65e1b9 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/SecurityConfHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/SecurityConfHandler.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.admin; - /* * 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.handler.admin; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.admin; import java.io.IOException; import java.util.ArrayList; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/SegmentsInfoRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/SegmentsInfoRequestHandler.java index 26ccc754be1..ee2cf5ea0e1 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/SegmentsInfoRequestHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/SegmentsInfoRequestHandler.java @@ -1,3 +1,19 @@ +/* + * 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.handler.admin; import java.io.IOException; @@ -21,23 +37,6 @@ import org.apache.solr.util.RefCounted; 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. - */ - /** * This handler exposes information about last commit generation segments */ diff --git a/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java index 64dae3ab756..b20ea262a53 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.admin; import org.apache.solr.cloud.ZkSolrResourceLoader; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java index a9a2da670eb..3525585c876 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.admin; - /* * 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.handler.admin; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.admin; import org.apache.commons.io.IOUtils; import org.apache.solr.handler.RequestHandlerBase; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java index e9854c7fda6..35ef906d353 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.admin; import java.beans.BeanInfo; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java index 2b0c0b4d258..3ddc9db58da 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.admin; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperInfoHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperInfoHandler.java index aa5bde645b9..8bc21305ab5 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperInfoHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperInfoHandler.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.admin; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/handler/admin/package-info.java b/solr/core/src/java/org/apache/solr/handler/admin/package-info.java index bce6448f987..c0a6eee2ed3 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/package-info.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * {@link org.apache.solr.request.SolrRequestHandler} implementations for powering he Solr Admin UI */ diff --git a/solr/core/src/java/org/apache/solr/handler/component/DateFacetProcessor.java b/solr/core/src/java/org/apache/solr/handler/component/DateFacetProcessor.java index 8760240b8d0..460d16af51a 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/DateFacetProcessor.java +++ b/solr/core/src/java/org/apache/solr/handler/component/DateFacetProcessor.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.component; - /* * 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.handler.component; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.component; import java.io.IOException; import java.util.Date; diff --git a/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java b/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java index 21755e1b71f..1b82f674884 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java +++ b/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.component; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java b/solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java index 694e53af08c..c38d1b52844 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java +++ b/solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.component; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java b/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java index 27e008f6a4f..e048457a15f 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java +++ b/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.component; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/handler/component/FieldFacetStats.java b/solr/core/src/java/org/apache/solr/handler/component/FieldFacetStats.java index 2887ce2cf27..6df92c0f6c7 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/FieldFacetStats.java +++ b/solr/core/src/java/org/apache/solr/handler/component/FieldFacetStats.java @@ -1,4 +1,3 @@ -package org.apache.solr.handler.component; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.handler.component; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.handler.component; import java.io.IOException; import java.util.ArrayList; import java.util.Collections; diff --git a/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java b/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java index 4bdcf33845d..235e956fed0 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java +++ b/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.component; import com.google.common.base.Objects; diff --git a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java index 4e57d3613ca..09dc1b862e1 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java @@ -1,4 +1,3 @@ -package org.apache.solr.handler.component; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.handler.component; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.handler.component; import java.lang.invoke.MethodHandles; import java.net.ConnectException; import java.util.Arrays; diff --git a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java index d5455cf86c9..d2800d75ce0 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java +++ b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java @@ -1,4 +1,3 @@ -package org.apache.solr.handler.component; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.handler.component; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.handler.component; import org.apache.commons.lang.StringUtils; import org.apache.http.client.HttpClient; import org.apache.http.impl.client.DefaultHttpClient; diff --git a/solr/core/src/java/org/apache/solr/handler/component/IterativeMergeStrategy.java b/solr/core/src/java/org/apache/solr/handler/component/IterativeMergeStrategy.java index 657d9c1448a..a8f6ca96e8f 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/IterativeMergeStrategy.java +++ b/solr/core/src/java/org/apache/solr/handler/component/IterativeMergeStrategy.java @@ -1,20 +1,19 @@ /* -* 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. -*/ - + * 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.handler.component; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/java/org/apache/solr/handler/component/MergeStrategy.java b/solr/core/src/java/org/apache/solr/handler/component/MergeStrategy.java index 8c3483be422..2a02653d95a 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/MergeStrategy.java +++ b/solr/core/src/java/org/apache/solr/handler/component/MergeStrategy.java @@ -1,20 +1,19 @@ /* -* 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. -*/ - + * 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.handler.component; import org.apache.solr.search.SolrIndexSearcher; diff --git a/solr/core/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java b/solr/core/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java index a79a496249a..bf1861c8533 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java +++ b/solr/core/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.component; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/handler/component/PivotFacet.java b/solr/core/src/java/org/apache/solr/handler/component/PivotFacet.java index 4cb73bac9a2..37a522e0299 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/PivotFacet.java +++ b/solr/core/src/java/org/apache/solr/handler/component/PivotFacet.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.component; import java.util.ArrayList; diff --git a/solr/core/src/java/org/apache/solr/handler/component/PivotFacetField.java b/solr/core/src/java/org/apache/solr/handler/component/PivotFacetField.java index 9de9c27f73d..9b738410edb 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/PivotFacetField.java +++ b/solr/core/src/java/org/apache/solr/handler/component/PivotFacetField.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.component; import java.util.ArrayList; diff --git a/solr/core/src/java/org/apache/solr/handler/component/PivotFacetFieldValueCollection.java b/solr/core/src/java/org/apache/solr/handler/component/PivotFacetFieldValueCollection.java index 33a0ef9c9c5..6aae231a3e4 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/PivotFacetFieldValueCollection.java +++ b/solr/core/src/java/org/apache/solr/handler/component/PivotFacetFieldValueCollection.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.component; - /* * 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.handler.component; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.component; import java.util.ArrayList; import java.util.Collections; diff --git a/solr/core/src/java/org/apache/solr/handler/component/PivotFacetHelper.java b/solr/core/src/java/org/apache/solr/handler/component/PivotFacetHelper.java index 9d484391657..33fe0860c61 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/PivotFacetHelper.java +++ b/solr/core/src/java/org/apache/solr/handler/component/PivotFacetHelper.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.component; import java.util.ArrayList; diff --git a/solr/core/src/java/org/apache/solr/handler/component/PivotFacetProcessor.java b/solr/core/src/java/org/apache/solr/handler/component/PivotFacetProcessor.java index d76d40306f7..011d6623837 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/PivotFacetProcessor.java +++ b/solr/core/src/java/org/apache/solr/handler/component/PivotFacetProcessor.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.component; - /* * 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.handler.component; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.component; import org.apache.lucene.util.BytesRefBuilder; import org.apache.solr.common.StringUtils; diff --git a/solr/core/src/java/org/apache/solr/handler/component/PivotFacetValue.java b/solr/core/src/java/org/apache/solr/handler/component/PivotFacetValue.java index 51a2c2afe17..a1eed07f679 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/PivotFacetValue.java +++ b/solr/core/src/java/org/apache/solr/handler/component/PivotFacetValue.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.component; - /* * 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.handler.component; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.component; import java.util.BitSet; import java.util.Date; diff --git a/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java b/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java index 05fe28dfe0e..c8559361960 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java +++ b/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.component; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java b/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java index 9d7cbfe28cf..bc69d0f1018 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java +++ b/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.component; import org.apache.lucene.analysis.Analyzer; diff --git a/solr/core/src/java/org/apache/solr/handler/component/RangeFacetProcessor.java b/solr/core/src/java/org/apache/solr/handler/component/RangeFacetProcessor.java index 6201bce0ae0..731d2240ec7 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/RangeFacetProcessor.java +++ b/solr/core/src/java/org/apache/solr/handler/component/RangeFacetProcessor.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.component; - /* * 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.handler.component; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.component; import java.io.IOException; import java.util.ArrayList; diff --git a/solr/core/src/java/org/apache/solr/handler/component/RangeFacetRequest.java b/solr/core/src/java/org/apache/solr/handler/component/RangeFacetRequest.java index c79f929bce3..92b118a8da0 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/RangeFacetRequest.java +++ b/solr/core/src/java/org/apache/solr/handler/component/RangeFacetRequest.java @@ -1,7 +1,3 @@ -package org.apache.solr.handler.component; - -import java.lang.invoke.MethodHandles; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import java.lang.invoke.MethodHandles; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.component; + +import java.lang.invoke.MethodHandles; import java.util.ArrayList; import java.util.Date; diff --git a/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java b/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java index 8d43cd08c2d..2e1f729a43c 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java +++ b/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.component; - /* * 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.handler.component; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.component; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/java/org/apache/solr/handler/component/ResponseBuilder.java b/solr/core/src/java/org/apache/solr/handler/component/ResponseBuilder.java index 8f20dbf44c5..8f05e26e4f2 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/ResponseBuilder.java +++ b/solr/core/src/java/org/apache/solr/handler/component/ResponseBuilder.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.component; import org.apache.lucene.search.Query; diff --git a/solr/core/src/java/org/apache/solr/handler/component/ResponseLogComponent.java b/solr/core/src/java/org/apache/solr/handler/component/ResponseLogComponent.java index d9102a72885..9bbfb810b62 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/ResponseLogComponent.java +++ b/solr/core/src/java/org/apache/solr/handler/component/ResponseLogComponent.java @@ -1,4 +1,3 @@ -package org.apache.solr.handler.component; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.handler.component; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.handler.component; import java.io.IOException; import java.util.Collections; import java.util.Set; diff --git a/solr/core/src/java/org/apache/solr/handler/component/SearchComponent.java b/solr/core/src/java/org/apache/solr/handler/component/SearchComponent.java index 6567b677053..7b707086b22 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/SearchComponent.java +++ b/solr/core/src/java/org/apache/solr/handler/component/SearchComponent.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.component; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java b/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java index 419fc3fe862..9cb41834e99 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.component; import java.io.PrintWriter; diff --git a/solr/core/src/java/org/apache/solr/handler/component/ShardFieldSortedHitQueue.java b/solr/core/src/java/org/apache/solr/handler/component/ShardFieldSortedHitQueue.java index fd0603d6b8a..745bc1f6c1a 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/ShardFieldSortedHitQueue.java +++ b/solr/core/src/java/org/apache/solr/handler/component/ShardFieldSortedHitQueue.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.component; - /* * 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.handler.component; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.component; import java.io.IOException; import java.util.ArrayList; diff --git a/solr/core/src/java/org/apache/solr/handler/component/ShardHandler.java b/solr/core/src/java/org/apache/solr/handler/component/ShardHandler.java index e239e02bb22..98294247c12 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/ShardHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/component/ShardHandler.java @@ -1,4 +1,3 @@ -package org.apache.solr.handler.component; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,8 +14,7 @@ package org.apache.solr.handler.component; * See the License for the specific language governing permissions and * limitations under the License. */ - - +package org.apache.solr.handler.component; import org.apache.solr.common.params.ModifiableSolrParams; public abstract class ShardHandler { diff --git a/solr/core/src/java/org/apache/solr/handler/component/ShardHandlerFactory.java b/solr/core/src/java/org/apache/solr/handler/component/ShardHandlerFactory.java index ab0e3c50925..937c20a0e43 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/ShardHandlerFactory.java +++ b/solr/core/src/java/org/apache/solr/handler/component/ShardHandlerFactory.java @@ -1,4 +1,3 @@ -package org.apache.solr.handler.component; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,8 +14,7 @@ package org.apache.solr.handler.component; * See the License for the specific language governing permissions and * limitations under the License. */ - - +package org.apache.solr.handler.component; import com.google.common.collect.ImmutableMap; import org.apache.solr.common.SolrException; import org.apache.solr.core.PluginInfo; diff --git a/solr/core/src/java/org/apache/solr/handler/component/ShardResponse.java b/solr/core/src/java/org/apache/solr/handler/component/ShardResponse.java index d2296806777..5da721c4ce7 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/ShardResponse.java +++ b/solr/core/src/java/org/apache/solr/handler/component/ShardResponse.java @@ -1,4 +1,3 @@ -package org.apache.solr.handler.component; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.handler.component; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.handler.component; import org.apache.solr.client.solrj.SolrResponse; import org.apache.solr.common.SolrException; diff --git a/solr/core/src/java/org/apache/solr/handler/component/SpatialHeatmapFacets.java b/solr/core/src/java/org/apache/solr/handler/component/SpatialHeatmapFacets.java index 1ba4f3f9524..dc1b9afd54d 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/SpatialHeatmapFacets.java +++ b/solr/core/src/java/org/apache/solr/handler/component/SpatialHeatmapFacets.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.component; - /* * 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.handler.component; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.component; import javax.imageio.ImageIO; import javax.imageio.ImageReader; diff --git a/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java b/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java index 934082d406d..37f6a1a64db 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java +++ b/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.component; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/handler/component/SpellCheckMergeData.java b/solr/core/src/java/org/apache/solr/handler/component/SpellCheckMergeData.java index ed450bb1c8b..4b8310abeab 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/SpellCheckMergeData.java +++ b/solr/core/src/java/org/apache/solr/handler/component/SpellCheckMergeData.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.component; - /* * 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.handler.component; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.component; import java.util.Collections; import java.util.HashMap; diff --git a/solr/core/src/java/org/apache/solr/handler/component/StatsComponent.java b/solr/core/src/java/org/apache/solr/handler/component/StatsComponent.java index 12ed7bcefeb..68284c7bcb2 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/StatsComponent.java +++ b/solr/core/src/java/org/apache/solr/handler/component/StatsComponent.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.component; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/handler/component/StatsField.java b/solr/core/src/java/org/apache/solr/handler/component/StatsField.java index a79715e90c5..6f151747cac 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/StatsField.java +++ b/solr/core/src/java/org/apache/solr/handler/component/StatsField.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.component; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/handler/component/StatsValues.java b/solr/core/src/java/org/apache/solr/handler/component/StatsValues.java index 87e2d2a6c10..8c85fda7a71 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/StatsValues.java +++ b/solr/core/src/java/org/apache/solr/handler/component/StatsValues.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.apache.solr.handler.component; diff --git a/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java b/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java index a8859909ddc..47f3851689a 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java +++ b/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java @@ -3,7 +3,7 @@ * 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 @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.component; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java b/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java index c6aac425327..bb87440c174 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java +++ b/solr/core/src/java/org/apache/solr/handler/component/SuggestComponent.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.component; - /* * 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.handler.component; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.component; import java.io.File; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java b/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java index 53777591ad8..60ceca0e4db 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java +++ b/solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java @@ -1,3 +1,19 @@ +/* + * 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.handler.component; import java.io.IOException; @@ -38,24 +54,6 @@ import org.apache.solr.search.SolrReturnFields; import org.apache.solr.util.SolrPluginUtils; import org.apache.solr.util.plugin.SolrCoreAware; -/* - * 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. - */ - - /** * Return term vectors for the documents in a query result set. *

    diff --git a/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java b/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java index 8c0fb18dd72..b41f3e756ac 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java +++ b/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java @@ -1,4 +1,3 @@ -package org.apache.solr.handler.component; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.handler.component; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.handler.component; import org.apache.lucene.index.*; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefBuilder; diff --git a/solr/core/src/java/org/apache/solr/handler/component/package-info.java b/solr/core/src/java/org/apache/solr/handler/component/package-info.java index 6bfde58f5bc..9fba06423bb 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/package-info.java +++ b/solr/core/src/java/org/apache/solr/handler/component/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * {@link org.apache.solr.handler.component.SearchComponent} implementations for * use in {@link org.apache.solr.handler.component.SearchHandler} diff --git a/solr/core/src/java/org/apache/solr/handler/loader/CSVLoader.java b/solr/core/src/java/org/apache/solr/handler/loader/CSVLoader.java index d9ae10f7060..11866a44643 100644 --- a/solr/core/src/java/org/apache/solr/handler/loader/CSVLoader.java +++ b/solr/core/src/java/org/apache/solr/handler/loader/CSVLoader.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.loader; import org.apache.solr.request.SolrQueryRequest; diff --git a/solr/core/src/java/org/apache/solr/handler/loader/CSVLoaderBase.java b/solr/core/src/java/org/apache/solr/handler/loader/CSVLoaderBase.java index a9a1c47e6e5..12e41c517e7 100644 --- a/solr/core/src/java/org/apache/solr/handler/loader/CSVLoaderBase.java +++ b/solr/core/src/java/org/apache/solr/handler/loader/CSVLoaderBase.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.loader; import org.apache.solr.request.SolrQueryRequest; diff --git a/solr/core/src/java/org/apache/solr/handler/loader/ContentStreamLoader.java b/solr/core/src/java/org/apache/solr/handler/loader/ContentStreamLoader.java index 6ab054de2d7..1dd038ffebe 100644 --- a/solr/core/src/java/org/apache/solr/handler/loader/ContentStreamLoader.java +++ b/solr/core/src/java/org/apache/solr/handler/loader/ContentStreamLoader.java @@ -1,4 +1,3 @@ -package org.apache.solr.handler.loader; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,8 +14,7 @@ package org.apache.solr.handler.loader; * See the License for the specific language governing permissions and * limitations under the License. */ - - +package org.apache.solr.handler.loader; import org.apache.solr.common.params.SolrParams; import org.apache.solr.common.util.ContentStream; import org.apache.solr.request.SolrQueryRequest; diff --git a/solr/core/src/java/org/apache/solr/handler/loader/JavabinLoader.java b/solr/core/src/java/org/apache/solr/handler/loader/JavabinLoader.java index 5c51cc2ffb0..6114280b833 100644 --- a/solr/core/src/java/org/apache/solr/handler/loader/JavabinLoader.java +++ b/solr/core/src/java/org/apache/solr/handler/loader/JavabinLoader.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.loader; import org.apache.solr.client.solrj.request.JavaBinUpdateRequestCodec; diff --git a/solr/core/src/java/org/apache/solr/handler/loader/JsonLoader.java b/solr/core/src/java/org/apache/solr/handler/loader/JsonLoader.java index 81bdad24b18..e99b2435958 100644 --- a/solr/core/src/java/org/apache/solr/handler/loader/JsonLoader.java +++ b/solr/core/src/java/org/apache/solr/handler/loader/JsonLoader.java @@ -1,4 +1,3 @@ -package org.apache.solr.handler.loader; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.handler.loader; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.handler.loader; import java.io.IOException; import java.io.Reader; import java.io.StringReader; diff --git a/solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java b/solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java index e1b961aba76..a75857cca48 100644 --- a/solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java +++ b/solr/core/src/java/org/apache/solr/handler/loader/XMLLoader.java @@ -1,4 +1,3 @@ -package org.apache.solr.handler.loader; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.handler.loader; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.handler.loader; import javax.xml.parsers.SAXParserFactory; import javax.xml.stream.FactoryConfigurationError; import javax.xml.stream.XMLInputFactory; diff --git a/solr/core/src/java/org/apache/solr/handler/loader/package-info.java b/solr/core/src/java/org/apache/solr/handler/loader/package-info.java index 8d4f54577e3..77b9e809c23 100644 --- a/solr/core/src/java/org/apache/solr/handler/loader/package-info.java +++ b/solr/core/src/java/org/apache/solr/handler/loader/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * {@link org.apache.solr.handler.loader.ContentStreamLoader} implementations for * use in {@link org.apache.solr.handler.ContentStreamHandlerBase} implementations diff --git a/solr/core/src/java/org/apache/solr/handler/package-info.java b/solr/core/src/java/org/apache/solr/handler/package-info.java index 8a3d0ea5db2..c3b49f2a90c 100644 --- a/solr/core/src/java/org/apache/solr/handler/package-info.java +++ b/solr/core/src/java/org/apache/solr/handler/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Concrete implementations of {@link org.apache.solr.request.SolrRequestHandler} */ diff --git a/solr/core/src/java/org/apache/solr/highlight/BreakIteratorBoundaryScanner.java b/solr/core/src/java/org/apache/solr/highlight/BreakIteratorBoundaryScanner.java index a9ab1e7ab9b..ded2d288c07 100644 --- a/solr/core/src/java/org/apache/solr/highlight/BreakIteratorBoundaryScanner.java +++ b/solr/core/src/java/org/apache/solr/highlight/BreakIteratorBoundaryScanner.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.highlight; import java.text.BreakIterator; diff --git a/solr/core/src/java/org/apache/solr/highlight/DefaultEncoder.java b/solr/core/src/java/org/apache/solr/highlight/DefaultEncoder.java index 94028a05d94..ed59988297a 100644 --- a/solr/core/src/java/org/apache/solr/highlight/DefaultEncoder.java +++ b/solr/core/src/java/org/apache/solr/highlight/DefaultEncoder.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.highlight; import org.apache.lucene.search.highlight.Encoder; diff --git a/solr/core/src/java/org/apache/solr/highlight/HighlightingPluginBase.java b/solr/core/src/java/org/apache/solr/highlight/HighlightingPluginBase.java index 266670afd1f..c03a961fc36 100644 --- a/solr/core/src/java/org/apache/solr/highlight/HighlightingPluginBase.java +++ b/solr/core/src/java/org/apache/solr/highlight/HighlightingPluginBase.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.highlight; import java.net.URL; diff --git a/solr/core/src/java/org/apache/solr/highlight/HtmlEncoder.java b/solr/core/src/java/org/apache/solr/highlight/HtmlEncoder.java index 9a5afedca8b..d8184fba0cd 100644 --- a/solr/core/src/java/org/apache/solr/highlight/HtmlEncoder.java +++ b/solr/core/src/java/org/apache/solr/highlight/HtmlEncoder.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.highlight; import org.apache.lucene.search.highlight.Encoder; diff --git a/solr/core/src/java/org/apache/solr/highlight/PostingsSolrHighlighter.java b/solr/core/src/java/org/apache/solr/highlight/PostingsSolrHighlighter.java index ddfa3de517d..a5816cd4c9e 100644 --- a/solr/core/src/java/org/apache/solr/highlight/PostingsSolrHighlighter.java +++ b/solr/core/src/java/org/apache/solr/highlight/PostingsSolrHighlighter.java @@ -1,5 +1,3 @@ -package org.apache.solr.highlight; - /* * 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.highlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.highlight; import java.io.IOException; import java.text.BreakIterator; diff --git a/solr/core/src/java/org/apache/solr/highlight/ScoreOrderFragmentsBuilder.java b/solr/core/src/java/org/apache/solr/highlight/ScoreOrderFragmentsBuilder.java index ea1b76185de..cb2360a6f74 100644 --- a/solr/core/src/java/org/apache/solr/highlight/ScoreOrderFragmentsBuilder.java +++ b/solr/core/src/java/org/apache/solr/highlight/ScoreOrderFragmentsBuilder.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.highlight; import org.apache.lucene.search.vectorhighlight.BoundaryScanner; diff --git a/solr/core/src/java/org/apache/solr/highlight/SimpleBoundaryScanner.java b/solr/core/src/java/org/apache/solr/highlight/SimpleBoundaryScanner.java index ab214aa5751..6fbacf8aac9 100644 --- a/solr/core/src/java/org/apache/solr/highlight/SimpleBoundaryScanner.java +++ b/solr/core/src/java/org/apache/solr/highlight/SimpleBoundaryScanner.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.highlight; import org.apache.lucene.search.vectorhighlight.BoundaryScanner; diff --git a/solr/core/src/java/org/apache/solr/highlight/SimpleFragListBuilder.java b/solr/core/src/java/org/apache/solr/highlight/SimpleFragListBuilder.java index de8ff32e221..ed5430ce1e6 100644 --- a/solr/core/src/java/org/apache/solr/highlight/SimpleFragListBuilder.java +++ b/solr/core/src/java/org/apache/solr/highlight/SimpleFragListBuilder.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.highlight; import org.apache.lucene.search.vectorhighlight.FragListBuilder; diff --git a/solr/core/src/java/org/apache/solr/highlight/SimpleFragmentsBuilder.java b/solr/core/src/java/org/apache/solr/highlight/SimpleFragmentsBuilder.java index 206c5615375..2afcfbd7d23 100644 --- a/solr/core/src/java/org/apache/solr/highlight/SimpleFragmentsBuilder.java +++ b/solr/core/src/java/org/apache/solr/highlight/SimpleFragmentsBuilder.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.highlight; import org.apache.lucene.search.vectorhighlight.BoundaryScanner; diff --git a/solr/core/src/java/org/apache/solr/highlight/SingleFragListBuilder.java b/solr/core/src/java/org/apache/solr/highlight/SingleFragListBuilder.java index fdbe406d2b9..0b79929b35d 100644 --- a/solr/core/src/java/org/apache/solr/highlight/SingleFragListBuilder.java +++ b/solr/core/src/java/org/apache/solr/highlight/SingleFragListBuilder.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.highlight; import org.apache.lucene.search.vectorhighlight.FragListBuilder; diff --git a/solr/core/src/java/org/apache/solr/highlight/SolrBoundaryScanner.java b/solr/core/src/java/org/apache/solr/highlight/SolrBoundaryScanner.java index 038a8d06a2a..6f442f72bf1 100644 --- a/solr/core/src/java/org/apache/solr/highlight/SolrBoundaryScanner.java +++ b/solr/core/src/java/org/apache/solr/highlight/SolrBoundaryScanner.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.highlight; import org.apache.lucene.search.vectorhighlight.BoundaryScanner; diff --git a/solr/core/src/java/org/apache/solr/highlight/SolrEncoder.java b/solr/core/src/java/org/apache/solr/highlight/SolrEncoder.java index eb8d2abf073..9f49228805d 100644 --- a/solr/core/src/java/org/apache/solr/highlight/SolrEncoder.java +++ b/solr/core/src/java/org/apache/solr/highlight/SolrEncoder.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.highlight; import org.apache.lucene.search.highlight.Encoder; diff --git a/solr/core/src/java/org/apache/solr/highlight/SolrFormatter.java b/solr/core/src/java/org/apache/solr/highlight/SolrFormatter.java index bdf28bf730d..a8f51dbcd46 100644 --- a/solr/core/src/java/org/apache/solr/highlight/SolrFormatter.java +++ b/solr/core/src/java/org/apache/solr/highlight/SolrFormatter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.highlight; import org.apache.lucene.search.highlight.Formatter; diff --git a/solr/core/src/java/org/apache/solr/highlight/SolrFragListBuilder.java b/solr/core/src/java/org/apache/solr/highlight/SolrFragListBuilder.java index 01c2875b48f..f0c36b4d602 100644 --- a/solr/core/src/java/org/apache/solr/highlight/SolrFragListBuilder.java +++ b/solr/core/src/java/org/apache/solr/highlight/SolrFragListBuilder.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.highlight; import org.apache.lucene.search.vectorhighlight.FragListBuilder; diff --git a/solr/core/src/java/org/apache/solr/highlight/SolrFragmenter.java b/solr/core/src/java/org/apache/solr/highlight/SolrFragmenter.java index eef46e4a9fe..547506f5cf1 100644 --- a/solr/core/src/java/org/apache/solr/highlight/SolrFragmenter.java +++ b/solr/core/src/java/org/apache/solr/highlight/SolrFragmenter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.highlight; import org.apache.lucene.search.highlight.Fragmenter; diff --git a/solr/core/src/java/org/apache/solr/highlight/SolrFragmentsBuilder.java b/solr/core/src/java/org/apache/solr/highlight/SolrFragmentsBuilder.java index c676488d743..78ea5a4deee 100644 --- a/solr/core/src/java/org/apache/solr/highlight/SolrFragmentsBuilder.java +++ b/solr/core/src/java/org/apache/solr/highlight/SolrFragmentsBuilder.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.highlight; import org.apache.lucene.search.vectorhighlight.BoundaryScanner; diff --git a/solr/core/src/java/org/apache/solr/highlight/SolrHighlighter.java b/solr/core/src/java/org/apache/solr/highlight/SolrHighlighter.java index 4b4f65014f8..a32be422c03 100644 --- a/solr/core/src/java/org/apache/solr/highlight/SolrHighlighter.java +++ b/solr/core/src/java/org/apache/solr/highlight/SolrHighlighter.java @@ -1,4 +1,3 @@ -package org.apache.solr.highlight; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.highlight; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.highlight; import org.apache.lucene.search.Query; import org.apache.solr.common.params.HighlightParams; import org.apache.solr.common.params.SolrParams; diff --git a/solr/core/src/java/org/apache/solr/highlight/WeightedFragListBuilder.java b/solr/core/src/java/org/apache/solr/highlight/WeightedFragListBuilder.java index 6cc0da27b7c..f44c0f0b430 100644 --- a/solr/core/src/java/org/apache/solr/highlight/WeightedFragListBuilder.java +++ b/solr/core/src/java/org/apache/solr/highlight/WeightedFragListBuilder.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.highlight; import org.apache.lucene.search.vectorhighlight.FragListBuilder; diff --git a/solr/core/src/java/org/apache/solr/highlight/package-info.java b/solr/core/src/java/org/apache/solr/highlight/package-info.java index fda20833f3f..e8de8a267b7 100644 --- a/solr/core/src/java/org/apache/solr/highlight/package-info.java +++ b/solr/core/src/java/org/apache/solr/highlight/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * {@link org.apache.solr.highlight.SolrHighlighter} API and related implementaions and utilities *

    diff --git a/solr/core/src/java/org/apache/solr/index/hdfs/CheckHdfsIndex.java b/solr/core/src/java/org/apache/solr/index/hdfs/CheckHdfsIndex.java index 16acc3e4334..ce1a9e0244a 100644 --- a/solr/core/src/java/org/apache/solr/index/hdfs/CheckHdfsIndex.java +++ b/solr/core/src/java/org/apache/solr/index/hdfs/CheckHdfsIndex.java @@ -1,5 +1,3 @@ -package org.apache.solr.index.hdfs; - /* * 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.index.hdfs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.index.hdfs; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/index/hdfs/package-info.java b/solr/core/src/java/org/apache/solr/index/hdfs/package-info.java index 9b23898a181..ddf41176d98 100644 --- a/solr/core/src/java/org/apache/solr/index/hdfs/package-info.java +++ b/solr/core/src/java/org/apache/solr/index/hdfs/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * An HDFS CheckIndex implementation. */ diff --git a/solr/core/src/java/org/apache/solr/internal/csv/CSVParser.java b/solr/core/src/java/org/apache/solr/internal/csv/CSVParser.java index 0582fc1bc26..8d88c372710 100644 --- a/solr/core/src/java/org/apache/solr/internal/csv/CSVParser.java +++ b/solr/core/src/java/org/apache/solr/internal/csv/CSVParser.java @@ -5,9 +5,9 @@ * 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 - * + * + * 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. diff --git a/solr/core/src/java/org/apache/solr/internal/csv/CSVPrinter.java b/solr/core/src/java/org/apache/solr/internal/csv/CSVPrinter.java index 9b343d9e0cb..bf081b75b29 100644 --- a/solr/core/src/java/org/apache/solr/internal/csv/CSVPrinter.java +++ b/solr/core/src/java/org/apache/solr/internal/csv/CSVPrinter.java @@ -5,9 +5,9 @@ * 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 - * + * + * 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. diff --git a/solr/core/src/java/org/apache/solr/internal/csv/CSVStrategy.java b/solr/core/src/java/org/apache/solr/internal/csv/CSVStrategy.java index 6cf1c67781f..9273908b0e8 100644 --- a/solr/core/src/java/org/apache/solr/internal/csv/CSVStrategy.java +++ b/solr/core/src/java/org/apache/solr/internal/csv/CSVStrategy.java @@ -5,9 +5,9 @@ * 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 - * + * + * 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. diff --git a/solr/core/src/java/org/apache/solr/internal/csv/CSVUtils.java b/solr/core/src/java/org/apache/solr/internal/csv/CSVUtils.java index 68fd8c369ea..cdea8c469b5 100644 --- a/solr/core/src/java/org/apache/solr/internal/csv/CSVUtils.java +++ b/solr/core/src/java/org/apache/solr/internal/csv/CSVUtils.java @@ -5,9 +5,9 @@ * 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 - * + * + * 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. diff --git a/solr/core/src/java/org/apache/solr/internal/csv/CharBuffer.java b/solr/core/src/java/org/apache/solr/internal/csv/CharBuffer.java index deccaff3c07..5fc9b4c66d3 100644 --- a/solr/core/src/java/org/apache/solr/internal/csv/CharBuffer.java +++ b/solr/core/src/java/org/apache/solr/internal/csv/CharBuffer.java @@ -1,20 +1,18 @@ /* - * 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 + * 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 + * 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. + * 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.internal.csv; diff --git a/solr/core/src/java/org/apache/solr/internal/csv/ExtendedBufferedReader.java b/solr/core/src/java/org/apache/solr/internal/csv/ExtendedBufferedReader.java index 8470906d05d..48f373a41d3 100644 --- a/solr/core/src/java/org/apache/solr/internal/csv/ExtendedBufferedReader.java +++ b/solr/core/src/java/org/apache/solr/internal/csv/ExtendedBufferedReader.java @@ -5,9 +5,9 @@ * 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 - * + * + * 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. diff --git a/solr/core/src/java/org/apache/solr/internal/csv/package-info.java b/solr/core/src/java/org/apache/solr/internal/csv/package-info.java index 9f5e794de39..bc4d6a598b1 100644 --- a/solr/core/src/java/org/apache/solr/internal/csv/package-info.java +++ b/solr/core/src/java/org/apache/solr/internal/csv/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Internal classes used for reading/writing CSV */ diff --git a/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVConfig.java b/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVConfig.java index 625eb9facb4..354bd3c9f3b 100644 --- a/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVConfig.java +++ b/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVConfig.java @@ -1,20 +1,18 @@ /* - * 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 + * 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 + * 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. + * 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.internal.csv.writer; diff --git a/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVConfigGuesser.java b/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVConfigGuesser.java index 50f598bac7f..26c8e3f3c86 100644 --- a/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVConfigGuesser.java +++ b/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVConfigGuesser.java @@ -1,20 +1,18 @@ /* - * 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 + * 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 + * 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. + * 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.internal.csv.writer; diff --git a/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVField.java b/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVField.java index 54d2fc532e8..eb7ba215816 100644 --- a/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVField.java +++ b/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVField.java @@ -1,20 +1,18 @@ /* - * 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 + * 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 + * 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. + * 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.internal.csv.writer; diff --git a/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVWriter.java b/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVWriter.java index 2bb2a4e5d66..aac69d115c4 100644 --- a/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVWriter.java +++ b/solr/core/src/java/org/apache/solr/internal/csv/writer/CSVWriter.java @@ -1,20 +1,18 @@ /* - * 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 + * 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 + * 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. + * 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.internal.csv.writer; diff --git a/solr/core/src/java/org/apache/solr/internal/csv/writer/package-info.java b/solr/core/src/java/org/apache/solr/internal/csv/writer/package-info.java index 932b8f00c47..89fcf5dd7ec 100644 --- a/solr/core/src/java/org/apache/solr/internal/csv/writer/package-info.java +++ b/solr/core/src/java/org/apache/solr/internal/csv/writer/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Internal classes used for reading/writing CSV */ diff --git a/solr/core/src/java/org/apache/solr/logging/CircularList.java b/solr/core/src/java/org/apache/solr/logging/CircularList.java index e9dc5618f4e..518dfdd8f13 100644 --- a/solr/core/src/java/org/apache/solr/logging/CircularList.java +++ b/solr/core/src/java/org/apache/solr/logging/CircularList.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.logging; import java.util.ArrayList; diff --git a/solr/core/src/java/org/apache/solr/logging/ListenerConfig.java b/solr/core/src/java/org/apache/solr/logging/ListenerConfig.java index 9a9ad8d00b8..ef7bbac8432 100644 --- a/solr/core/src/java/org/apache/solr/logging/ListenerConfig.java +++ b/solr/core/src/java/org/apache/solr/logging/ListenerConfig.java @@ -1,6 +1,3 @@ -package org.apache.solr.logging; - - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +14,8 @@ package org.apache.solr.logging; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.logging; + public class ListenerConfig { diff --git a/solr/core/src/java/org/apache/solr/logging/LogWatcher.java b/solr/core/src/java/org/apache/solr/logging/LogWatcher.java index 002605dc056..3ba74217c12 100644 --- a/solr/core/src/java/org/apache/solr/logging/LogWatcher.java +++ b/solr/core/src/java/org/apache/solr/logging/LogWatcher.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.logging; import org.apache.solr.common.SolrDocument; diff --git a/solr/core/src/java/org/apache/solr/logging/LogWatcherConfig.java b/solr/core/src/java/org/apache/solr/logging/LogWatcherConfig.java index 91df842be5a..20cfeb2a902 100644 --- a/solr/core/src/java/org/apache/solr/logging/LogWatcherConfig.java +++ b/solr/core/src/java/org/apache/solr/logging/LogWatcherConfig.java @@ -1,5 +1,3 @@ -package org.apache.solr.logging; - /* * 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.logging; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.logging; /** * Defines the configuration of a {@link LogWatcher} diff --git a/solr/core/src/java/org/apache/solr/logging/LoggerInfo.java b/solr/core/src/java/org/apache/solr/logging/LoggerInfo.java index 2cd9553cb90..8692ea5e592 100644 --- a/solr/core/src/java/org/apache/solr/logging/LoggerInfo.java +++ b/solr/core/src/java/org/apache/solr/logging/LoggerInfo.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.logging; import org.apache.solr.common.util.SimpleOrderedMap; diff --git a/solr/core/src/java/org/apache/solr/logging/MDCLoggingContext.java b/solr/core/src/java/org/apache/solr/logging/MDCLoggingContext.java index 488adb4d45e..5ff77429156 100644 --- a/solr/core/src/java/org/apache/solr/logging/MDCLoggingContext.java +++ b/solr/core/src/java/org/apache/solr/logging/MDCLoggingContext.java @@ -1,5 +1,3 @@ -package org.apache.solr.logging; - /* * 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.logging; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.logging; import static org.apache.solr.common.cloud.ZkStateReader.COLLECTION_PROP; import static org.apache.solr.common.cloud.ZkStateReader.CORE_NAME_PROP; diff --git a/solr/core/src/java/org/apache/solr/logging/jul/package-info.java b/solr/core/src/java/org/apache/solr/logging/jul/package-info.java index 138b5d70da2..9dc4c95a87f 100644 --- a/solr/core/src/java/org/apache/solr/logging/jul/package-info.java +++ b/solr/core/src/java/org/apache/solr/logging/jul/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * JUL based implementation of {@link org.apache.solr.logging.LogWatcher} */ diff --git a/solr/core/src/java/org/apache/solr/logging/log4j/package-info.java b/solr/core/src/java/org/apache/solr/logging/log4j/package-info.java index f78953385cd..c897abe71ab 100644 --- a/solr/core/src/java/org/apache/solr/logging/log4j/package-info.java +++ b/solr/core/src/java/org/apache/solr/logging/log4j/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Log4j based implementation of {@link org.apache.solr.logging.LogWatcher} */ diff --git a/solr/core/src/java/org/apache/solr/logging/package-info.java b/solr/core/src/java/org/apache/solr/logging/package-info.java index fc7380976f2..dae89d547fe 100644 --- a/solr/core/src/java/org/apache/solr/logging/package-info.java +++ b/solr/core/src/java/org/apache/solr/logging/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * APIs related to capturing log event info in the {@link org.apache.solr.handler.admin.LoggingHandler} */ diff --git a/solr/core/src/java/org/apache/solr/package-info.java b/solr/core/src/java/org/apache/solr/package-info.java index 38cd6fe6b6c..1609526e0dd 100644 --- a/solr/core/src/java/org/apache/solr/package-info.java +++ b/solr/core/src/java/org/apache/solr/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Commonly reused classes and interfaces (deprecated package, do not add new classes) */ diff --git a/solr/core/src/java/org/apache/solr/parser/FastCharStream.java b/solr/core/src/java/org/apache/solr/parser/FastCharStream.java index 91dbf9145d7..6a283f20d09 100644 --- a/solr/core/src/java/org/apache/solr/parser/FastCharStream.java +++ b/solr/core/src/java/org/apache/solr/parser/FastCharStream.java @@ -1,6 +1,3 @@ -// FastCharStream.java -package org.apache.solr.parser; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,8 +13,8 @@ package org.apache.solr.parser; * 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.parser; import java.io.*; diff --git a/solr/core/src/java/org/apache/solr/parser/SolrQueryParserBase.java b/solr/core/src/java/org/apache/solr/parser/SolrQueryParserBase.java index 4eddd971d3f..20fee1e854a 100644 --- a/solr/core/src/java/org/apache/solr/parser/SolrQueryParserBase.java +++ b/solr/core/src/java/org/apache/solr/parser/SolrQueryParserBase.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.parser; import java.io.StringReader; diff --git a/solr/core/src/java/org/apache/solr/parser/package-info.java b/solr/core/src/java/org/apache/solr/parser/package-info.java index aaadc129770..11304ea5bf3 100644 --- a/solr/core/src/java/org/apache/solr/parser/package-info.java +++ b/solr/core/src/java/org/apache/solr/parser/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Solr native variant of the {@linkplain org.apache.lucene.queryparser.classic.QueryParser Lucene Classic QueryParser} */ diff --git a/solr/core/src/java/org/apache/solr/query/FilterQuery.java b/solr/core/src/java/org/apache/solr/query/FilterQuery.java index 970e0ff1a44..bd93bb69cde 100644 --- a/solr/core/src/java/org/apache/solr/query/FilterQuery.java +++ b/solr/core/src/java/org/apache/solr/query/FilterQuery.java @@ -1,5 +1,3 @@ -package org.apache.solr.query; - /* * 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.query; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.query; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/query/SolrRangeQuery.java b/solr/core/src/java/org/apache/solr/query/SolrRangeQuery.java index fc28459d820..3d9e5eb126d 100644 --- a/solr/core/src/java/org/apache/solr/query/SolrRangeQuery.java +++ b/solr/core/src/java/org/apache/solr/query/SolrRangeQuery.java @@ -1,5 +1,3 @@ -package org.apache.solr.query; - /* * 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.query; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.query; import java.io.IOException; import java.util.ArrayList; diff --git a/solr/core/src/java/org/apache/solr/request/DocValuesFacets.java b/solr/core/src/java/org/apache/solr/request/DocValuesFacets.java index 04709a1ae12..7edeabe226c 100644 --- a/solr/core/src/java/org/apache/solr/request/DocValuesFacets.java +++ b/solr/core/src/java/org/apache/solr/request/DocValuesFacets.java @@ -1,5 +1,3 @@ -package org.apache.solr.request; - /* * 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.request; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.request; import org.apache.lucene.index.DocValues; import org.apache.lucene.index.LeafReaderContext; diff --git a/solr/core/src/java/org/apache/solr/request/DocValuesStats.java b/solr/core/src/java/org/apache/solr/request/DocValuesStats.java index 60cf32d7c6e..4001f5a5d63 100644 --- a/solr/core/src/java/org/apache/solr/request/DocValuesStats.java +++ b/solr/core/src/java/org/apache/solr/request/DocValuesStats.java @@ -1,5 +1,3 @@ -package org.apache.solr.request; - /* * 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.request; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.request; import java.io.IOException; import java.util.List; diff --git a/solr/core/src/java/org/apache/solr/request/IntervalFacets.java b/solr/core/src/java/org/apache/solr/request/IntervalFacets.java index 9be507cc1ca..e6060869188 100644 --- a/solr/core/src/java/org/apache/solr/request/IntervalFacets.java +++ b/solr/core/src/java/org/apache/solr/request/IntervalFacets.java @@ -1,3 +1,19 @@ +/* + * 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.request; import java.io.IOException; @@ -34,23 +50,6 @@ import org.apache.solr.search.QueryParsing; import org.apache.solr.search.SolrIndexSearcher; import org.apache.solr.search.SyntaxError; -/* - * 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. - */ - /** * Computes interval facets for docvalues field (single or multivalued). *

    diff --git a/solr/core/src/java/org/apache/solr/request/LocalSolrQueryRequest.java b/solr/core/src/java/org/apache/solr/request/LocalSolrQueryRequest.java index dbae07ca70d..3421126e23f 100644 --- a/solr/core/src/java/org/apache/solr/request/LocalSolrQueryRequest.java +++ b/solr/core/src/java/org/apache/solr/request/LocalSolrQueryRequest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.request; import org.apache.solr.common.params.CommonParams; diff --git a/solr/core/src/java/org/apache/solr/request/NumericFacets.java b/solr/core/src/java/org/apache/solr/request/NumericFacets.java index 4ccc1a3abdc..1034947ca9f 100644 --- a/solr/core/src/java/org/apache/solr/request/NumericFacets.java +++ b/solr/core/src/java/org/apache/solr/request/NumericFacets.java @@ -1,5 +1,3 @@ -package org.apache.solr.request; - /* * 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.request; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.request; import java.io.IOException; import java.util.ArrayDeque; diff --git a/solr/core/src/java/org/apache/solr/request/PerSegmentSingleValuedFaceting.java b/solr/core/src/java/org/apache/solr/request/PerSegmentSingleValuedFaceting.java index 906fe9a66c1..62a41468a7a 100644 --- a/solr/core/src/java/org/apache/solr/request/PerSegmentSingleValuedFaceting.java +++ b/solr/core/src/java/org/apache/solr/request/PerSegmentSingleValuedFaceting.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.request; import org.apache.lucene.index.DocValues; diff --git a/solr/core/src/java/org/apache/solr/request/SimpleFacets.java b/solr/core/src/java/org/apache/solr/request/SimpleFacets.java index 7b7df2b7917..e13cd75be92 100644 --- a/solr/core/src/java/org/apache/solr/request/SimpleFacets.java +++ b/solr/core/src/java/org/apache/solr/request/SimpleFacets.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.request; import org.apache.commons.lang.StringUtils; diff --git a/solr/core/src/java/org/apache/solr/request/SolrQueryRequest.java b/solr/core/src/java/org/apache/solr/request/SolrQueryRequest.java index ee3a18de21f..35d04f61510 100644 --- a/solr/core/src/java/org/apache/solr/request/SolrQueryRequest.java +++ b/solr/core/src/java/org/apache/solr/request/SolrQueryRequest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.request; import org.apache.solr.search.SolrIndexSearcher; diff --git a/solr/core/src/java/org/apache/solr/request/SolrQueryRequestBase.java b/solr/core/src/java/org/apache/solr/request/SolrQueryRequestBase.java index 558cb87c1ea..ebee2fc76cd 100644 --- a/solr/core/src/java/org/apache/solr/request/SolrQueryRequestBase.java +++ b/solr/core/src/java/org/apache/solr/request/SolrQueryRequestBase.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.request; import org.apache.solr.common.util.SuppressForbidden; diff --git a/solr/core/src/java/org/apache/solr/request/SolrRequestHandler.java b/solr/core/src/java/org/apache/solr/request/SolrRequestHandler.java index 1c61092860c..82ce2e0fbeb 100644 --- a/solr/core/src/java/org/apache/solr/request/SolrRequestHandler.java +++ b/solr/core/src/java/org/apache/solr/request/SolrRequestHandler.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.request; import org.apache.solr.common.util.NamedList; diff --git a/solr/core/src/java/org/apache/solr/request/SolrRequestInfo.java b/solr/core/src/java/org/apache/solr/request/SolrRequestInfo.java index 5cf0bef3e76..237173adcb6 100644 --- a/solr/core/src/java/org/apache/solr/request/SolrRequestInfo.java +++ b/solr/core/src/java/org/apache/solr/request/SolrRequestInfo.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.request; import java.io.Closeable; diff --git a/solr/core/src/java/org/apache/solr/request/json/JSONUtil.java b/solr/core/src/java/org/apache/solr/request/json/JSONUtil.java index 5356901f1be..6c07f4acc23 100644 --- a/solr/core/src/java/org/apache/solr/request/json/JSONUtil.java +++ b/solr/core/src/java/org/apache/solr/request/json/JSONUtil.java @@ -1,5 +1,3 @@ -package org.apache.solr.request.json; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,7 +14,7 @@ package org.apache.solr.request.json; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.request.json; import java.io.IOException; import java.util.ArrayList; diff --git a/solr/core/src/java/org/apache/solr/request/json/ObjectUtil.java b/solr/core/src/java/org/apache/solr/request/json/ObjectUtil.java index 66ac8274cfc..d29a266090c 100644 --- a/solr/core/src/java/org/apache/solr/request/json/ObjectUtil.java +++ b/solr/core/src/java/org/apache/solr/request/json/ObjectUtil.java @@ -1,5 +1,3 @@ -package org.apache.solr.request.json; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,7 +14,7 @@ package org.apache.solr.request.json; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.request.json; import java.io.IOException; import java.util.ArrayList; diff --git a/solr/core/src/java/org/apache/solr/request/json/RequestUtil.java b/solr/core/src/java/org/apache/solr/request/json/RequestUtil.java index 310fce47228..20efdc33c5e 100644 --- a/solr/core/src/java/org/apache/solr/request/json/RequestUtil.java +++ b/solr/core/src/java/org/apache/solr/request/json/RequestUtil.java @@ -1,5 +1,3 @@ -package org.apache.solr.request.json; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,7 +14,7 @@ package org.apache.solr.request.json; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.request.json; import java.io.IOException; import java.util.LinkedHashMap; diff --git a/solr/core/src/java/org/apache/solr/request/macro/MacroExpander.java b/solr/core/src/java/org/apache/solr/request/macro/MacroExpander.java index 80c51b2865b..ff8a19b18eb 100644 --- a/solr/core/src/java/org/apache/solr/request/macro/MacroExpander.java +++ b/solr/core/src/java/org/apache/solr/request/macro/MacroExpander.java @@ -1,5 +1,3 @@ -package org.apache.solr.request.macro; - /* * 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.request.macro; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.request.macro; import org.apache.solr.common.SolrException; import org.apache.solr.search.StrParser; diff --git a/solr/core/src/java/org/apache/solr/request/package-info.java b/solr/core/src/java/org/apache/solr/request/package-info.java index a75bda59dba..5c11f00f31e 100644 --- a/solr/core/src/java/org/apache/solr/request/package-info.java +++ b/solr/core/src/java/org/apache/solr/request/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * APIs and classes for dealing with Solr requests */ diff --git a/solr/core/src/java/org/apache/solr/response/BasicResultContext.java b/solr/core/src/java/org/apache/solr/response/BasicResultContext.java index 44d1df507df..792e483c548 100644 --- a/solr/core/src/java/org/apache/solr/response/BasicResultContext.java +++ b/solr/core/src/java/org/apache/solr/response/BasicResultContext.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 @@ -16,6 +14,7 @@ package org.apache.solr.response; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.response; import org.apache.lucene.search.Query; import org.apache.solr.handler.component.ResponseBuilder; diff --git a/solr/core/src/java/org/apache/solr/response/BinaryQueryResponseWriter.java b/solr/core/src/java/org/apache/solr/response/BinaryQueryResponseWriter.java index 9273b0a1980..85235e651db 100644 --- a/solr/core/src/java/org/apache/solr/response/BinaryQueryResponseWriter.java +++ b/solr/core/src/java/org/apache/solr/response/BinaryQueryResponseWriter.java @@ -1,4 +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 @@ -15,8 +14,7 @@ package org.apache.solr.response; * See the License for the specific language governing permissions and * limitations under the License. */ - - +package org.apache.solr.response; import java.io.OutputStream; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/response/CSVResponseWriter.java b/solr/core/src/java/org/apache/solr/response/CSVResponseWriter.java index 63db7b963fb..816e0e038f0 100644 --- a/solr/core/src/java/org/apache/solr/response/CSVResponseWriter.java +++ b/solr/core/src/java/org/apache/solr/response/CSVResponseWriter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.response; import java.io.CharArrayWriter; diff --git a/solr/core/src/java/org/apache/solr/response/DocsStreamer.java b/solr/core/src/java/org/apache/solr/response/DocsStreamer.java index 21aa3787b56..bee699ca749 100644 --- a/solr/core/src/java/org/apache/solr/response/DocsStreamer.java +++ b/solr/core/src/java/org/apache/solr/response/DocsStreamer.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 @@ -16,6 +14,7 @@ package org.apache.solr.response; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.response; import java.io.IOException; import java.util.ArrayList; diff --git a/solr/core/src/java/org/apache/solr/response/JSONResponseWriter.java b/solr/core/src/java/org/apache/solr/response/JSONResponseWriter.java index f61f2b939f8..cf894b82142 100644 --- a/solr/core/src/java/org/apache/solr/response/JSONResponseWriter.java +++ b/solr/core/src/java/org/apache/solr/response/JSONResponseWriter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.response; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/response/PHPResponseWriter.java b/solr/core/src/java/org/apache/solr/response/PHPResponseWriter.java index 24de3462c12..529a429dd83 100644 --- a/solr/core/src/java/org/apache/solr/response/PHPResponseWriter.java +++ b/solr/core/src/java/org/apache/solr/response/PHPResponseWriter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.response; import java.io.Writer; diff --git a/solr/core/src/java/org/apache/solr/response/PHPSerializedResponseWriter.java b/solr/core/src/java/org/apache/solr/response/PHPSerializedResponseWriter.java index 49a813dd6e8..9737eb4ad04 100644 --- a/solr/core/src/java/org/apache/solr/response/PHPSerializedResponseWriter.java +++ b/solr/core/src/java/org/apache/solr/response/PHPSerializedResponseWriter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.response; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/response/PythonResponseWriter.java b/solr/core/src/java/org/apache/solr/response/PythonResponseWriter.java index bf35a517508..98109df042f 100644 --- a/solr/core/src/java/org/apache/solr/response/PythonResponseWriter.java +++ b/solr/core/src/java/org/apache/solr/response/PythonResponseWriter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.response; import java.io.Writer; diff --git a/solr/core/src/java/org/apache/solr/response/QueryResponseWriter.java b/solr/core/src/java/org/apache/solr/response/QueryResponseWriter.java index 6742e5c3d82..c3fdf4a45b3 100644 --- a/solr/core/src/java/org/apache/solr/response/QueryResponseWriter.java +++ b/solr/core/src/java/org/apache/solr/response/QueryResponseWriter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.response; import java.io.Writer; diff --git a/solr/core/src/java/org/apache/solr/response/QueryResponseWriterUtil.java b/solr/core/src/java/org/apache/solr/response/QueryResponseWriterUtil.java index 72363eb19f5..bd56141758f 100644 --- a/solr/core/src/java/org/apache/solr/response/QueryResponseWriterUtil.java +++ b/solr/core/src/java/org/apache/solr/response/QueryResponseWriterUtil.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.response; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/response/RawResponseWriter.java b/solr/core/src/java/org/apache/solr/response/RawResponseWriter.java index a67181049dc..ffad4b96896 100644 --- a/solr/core/src/java/org/apache/solr/response/RawResponseWriter.java +++ b/solr/core/src/java/org/apache/solr/response/RawResponseWriter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.response; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/response/ResultContext.java b/solr/core/src/java/org/apache/solr/response/ResultContext.java index 425a52375f7..b8cd6b2029e 100644 --- a/solr/core/src/java/org/apache/solr/response/ResultContext.java +++ b/solr/core/src/java/org/apache/solr/response/ResultContext.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.response; import java.util.Iterator; diff --git a/solr/core/src/java/org/apache/solr/response/SchemaXmlResponseWriter.java b/solr/core/src/java/org/apache/solr/response/SchemaXmlResponseWriter.java index aafaeaa27ad..95a3bc761c6 100644 --- a/solr/core/src/java/org/apache/solr/response/SchemaXmlResponseWriter.java +++ b/solr/core/src/java/org/apache/solr/response/SchemaXmlResponseWriter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.response; import java.io.Writer; diff --git a/solr/core/src/java/org/apache/solr/response/SchemaXmlWriter.java b/solr/core/src/java/org/apache/solr/response/SchemaXmlWriter.java index d66148feb0e..4ed4d8f06d3 100644 --- a/solr/core/src/java/org/apache/solr/response/SchemaXmlWriter.java +++ b/solr/core/src/java/org/apache/solr/response/SchemaXmlWriter.java @@ -1,4 +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 @@ -15,7 +14,7 @@ package org.apache.solr.response; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.response; import java.io.IOException; import java.io.Writer; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/java/org/apache/solr/response/SmileResponseWriter.java b/solr/core/src/java/org/apache/solr/response/SmileResponseWriter.java index 31aa8b3b4e1..da8133305f2 100644 --- a/solr/core/src/java/org/apache/solr/response/SmileResponseWriter.java +++ b/solr/core/src/java/org/apache/solr/response/SmileResponseWriter.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 @@ -16,7 +14,7 @@ package org.apache.solr.response; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.response; import java.io.IOException; import java.io.OutputStream; diff --git a/solr/core/src/java/org/apache/solr/response/SolrQueryResponse.java b/solr/core/src/java/org/apache/solr/response/SolrQueryResponse.java index b21d4c50f94..277848b987e 100644 --- a/solr/core/src/java/org/apache/solr/response/SolrQueryResponse.java +++ b/solr/core/src/java/org/apache/solr/response/SolrQueryResponse.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.response; import java.util.Collection; diff --git a/solr/core/src/java/org/apache/solr/response/SortingResponseWriter.java b/solr/core/src/java/org/apache/solr/response/SortingResponseWriter.java index 6b6d36c6dc2..8daf90f93e1 100644 --- a/solr/core/src/java/org/apache/solr/response/SortingResponseWriter.java +++ b/solr/core/src/java/org/apache/solr/response/SortingResponseWriter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.response; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/response/TextResponseWriter.java b/solr/core/src/java/org/apache/solr/response/TextResponseWriter.java index a920a5f0732..3f9e0107126 100644 --- a/solr/core/src/java/org/apache/solr/response/TextResponseWriter.java +++ b/solr/core/src/java/org/apache/solr/response/TextResponseWriter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.response; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/response/XMLResponseWriter.java b/solr/core/src/java/org/apache/solr/response/XMLResponseWriter.java index 52e5a1dc066..09e37e3cb4c 100644 --- a/solr/core/src/java/org/apache/solr/response/XMLResponseWriter.java +++ b/solr/core/src/java/org/apache/solr/response/XMLResponseWriter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.response; import java.io.Writer; diff --git a/solr/core/src/java/org/apache/solr/response/XMLWriter.java b/solr/core/src/java/org/apache/solr/response/XMLWriter.java index 9711671795a..777b8b1e171 100644 --- a/solr/core/src/java/org/apache/solr/response/XMLWriter.java +++ b/solr/core/src/java/org/apache/solr/response/XMLWriter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.response; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/response/XSLTResponseWriter.java b/solr/core/src/java/org/apache/solr/response/XSLTResponseWriter.java index bd2edf67d96..7b6cf00c8bf 100644 --- a/solr/core/src/java/org/apache/solr/response/XSLTResponseWriter.java +++ b/solr/core/src/java/org/apache/solr/response/XSLTResponseWriter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.response; import java.io.BufferedReader; diff --git a/solr/core/src/java/org/apache/solr/response/package-info.java b/solr/core/src/java/org/apache/solr/response/package-info.java index 6b4bd2c6fed..ed89f5d44ce 100644 --- a/solr/core/src/java/org/apache/solr/response/package-info.java +++ b/solr/core/src/java/org/apache/solr/response/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * API and implementations of {@link org.apache.solr.response.QueryResponseWriter} for formating Solr request responses */ diff --git a/solr/core/src/java/org/apache/solr/response/transform/BaseEditorialTransformer.java b/solr/core/src/java/org/apache/solr/response/transform/BaseEditorialTransformer.java index c55d0350a0c..80e0b61373c 100644 --- a/solr/core/src/java/org/apache/solr/response/transform/BaseEditorialTransformer.java +++ b/solr/core/src/java/org/apache/solr/response/transform/BaseEditorialTransformer.java @@ -1,6 +1,3 @@ -package org.apache.solr.response.transform; - - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +14,8 @@ package org.apache.solr.response.transform; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.response.transform; + import org.apache.lucene.document.Field; import org.apache.solr.common.SolrDocument; diff --git a/solr/core/src/java/org/apache/solr/response/transform/DocTransformer.java b/solr/core/src/java/org/apache/solr/response/transform/DocTransformer.java index 374a0db900d..11e3a9b69e4 100644 --- a/solr/core/src/java/org/apache/solr/response/transform/DocTransformer.java +++ b/solr/core/src/java/org/apache/solr/response/transform/DocTransformer.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.response.transform; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/response/transform/DocTransformers.java b/solr/core/src/java/org/apache/solr/response/transform/DocTransformers.java index b7c6d380356..e0b3a3c6eec 100644 --- a/solr/core/src/java/org/apache/solr/response/transform/DocTransformers.java +++ b/solr/core/src/java/org/apache/solr/response/transform/DocTransformers.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.response.transform; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/response/transform/ElevatedMarkerFactory.java b/solr/core/src/java/org/apache/solr/response/transform/ElevatedMarkerFactory.java index 81322393a64..51f3cff9644 100644 --- a/solr/core/src/java/org/apache/solr/response/transform/ElevatedMarkerFactory.java +++ b/solr/core/src/java/org/apache/solr/response/transform/ElevatedMarkerFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.response.transform; - /* * 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.response.transform; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.response.transform; import java.util.Set; diff --git a/solr/core/src/java/org/apache/solr/response/transform/ExcludedMarkerFactory.java b/solr/core/src/java/org/apache/solr/response/transform/ExcludedMarkerFactory.java index ff92bb7695f..cf23a802d5e 100644 --- a/solr/core/src/java/org/apache/solr/response/transform/ExcludedMarkerFactory.java +++ b/solr/core/src/java/org/apache/solr/response/transform/ExcludedMarkerFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.response.transform; - /* * 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.response.transform; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.response.transform; import java.util.Set; diff --git a/solr/core/src/java/org/apache/solr/response/transform/TransformerFactory.java b/solr/core/src/java/org/apache/solr/response/transform/TransformerFactory.java index 249651b0e79..a600adfcc4a 100644 --- a/solr/core/src/java/org/apache/solr/response/transform/TransformerFactory.java +++ b/solr/core/src/java/org/apache/solr/response/transform/TransformerFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.response.transform; import java.util.HashMap; diff --git a/solr/core/src/java/org/apache/solr/response/transform/package-info.java b/solr/core/src/java/org/apache/solr/response/transform/package-info.java index 7b48f3646ed..50e3939d4c0 100644 --- a/solr/core/src/java/org/apache/solr/response/transform/package-info.java +++ b/solr/core/src/java/org/apache/solr/response/transform/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * APIs and implementations of {@link org.apache.solr.response.transform.DocTransformer} for modifying documents in Solr request responses */ diff --git a/solr/core/src/java/org/apache/solr/rest/BaseSolrResource.java b/solr/core/src/java/org/apache/solr/rest/BaseSolrResource.java index 3c4ff4667b9..381978b7159 100644 --- a/solr/core/src/java/org/apache/solr/rest/BaseSolrResource.java +++ b/solr/core/src/java/org/apache/solr/rest/BaseSolrResource.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.rest; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.rest; import java.io.IOException; import java.io.OutputStream; import java.io.UnsupportedEncodingException; diff --git a/solr/core/src/java/org/apache/solr/rest/DELETEable.java b/solr/core/src/java/org/apache/solr/rest/DELETEable.java index 93c536adae8..591f35ca866 100644 --- a/solr/core/src/java/org/apache/solr/rest/DELETEable.java +++ b/solr/core/src/java/org/apache/solr/rest/DELETEable.java @@ -1,5 +1,3 @@ -package org.apache.solr.rest; - /* * 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.rest; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.rest; import org.restlet.representation.Representation; import org.restlet.resource.Delete; diff --git a/solr/core/src/java/org/apache/solr/rest/GETable.java b/solr/core/src/java/org/apache/solr/rest/GETable.java index ac8644b2bd5..131ffe9ac34 100644 --- a/solr/core/src/java/org/apache/solr/rest/GETable.java +++ b/solr/core/src/java/org/apache/solr/rest/GETable.java @@ -1,5 +1,3 @@ -package org.apache.solr.rest; - /* * 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.rest; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.rest; import org.restlet.representation.Representation; import org.restlet.resource.Get; diff --git a/solr/core/src/java/org/apache/solr/rest/ManagedResource.java b/solr/core/src/java/org/apache/solr/rest/ManagedResource.java index f112de4ce93..6b023643b87 100644 --- a/solr/core/src/java/org/apache/solr/rest/ManagedResource.java +++ b/solr/core/src/java/org/apache/solr/rest/ManagedResource.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.rest; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.rest; import java.io.FileNotFoundException; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/java/org/apache/solr/rest/ManagedResourceObserver.java b/solr/core/src/java/org/apache/solr/rest/ManagedResourceObserver.java index cee7bc2abb0..0d651663eaf 100644 --- a/solr/core/src/java/org/apache/solr/rest/ManagedResourceObserver.java +++ b/solr/core/src/java/org/apache/solr/rest/ManagedResourceObserver.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.rest; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.rest; import org.apache.solr.common.SolrException; import org.apache.solr.common.util.NamedList; diff --git a/solr/core/src/java/org/apache/solr/rest/ManagedResourceStorage.java b/solr/core/src/java/org/apache/solr/rest/ManagedResourceStorage.java index a92e58eb1d0..230bf44a25e 100644 --- a/solr/core/src/java/org/apache/solr/rest/ManagedResourceStorage.java +++ b/solr/core/src/java/org/apache/solr/rest/ManagedResourceStorage.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.rest; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.rest; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; diff --git a/solr/core/src/java/org/apache/solr/rest/POSTable.java b/solr/core/src/java/org/apache/solr/rest/POSTable.java index 407712b37bf..5b7fd4e340b 100644 --- a/solr/core/src/java/org/apache/solr/rest/POSTable.java +++ b/solr/core/src/java/org/apache/solr/rest/POSTable.java @@ -1,5 +1,3 @@ -package org.apache.solr.rest; - /* * 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.rest; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.rest; import org.restlet.representation.Representation; import org.restlet.resource.Post; diff --git a/solr/core/src/java/org/apache/solr/rest/PUTable.java b/solr/core/src/java/org/apache/solr/rest/PUTable.java index 1762c59b77c..e8b27b4632b 100644 --- a/solr/core/src/java/org/apache/solr/rest/PUTable.java +++ b/solr/core/src/java/org/apache/solr/rest/PUTable.java @@ -1,5 +1,3 @@ -package org.apache.solr.rest; - /* * 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.rest; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.rest; import org.restlet.representation.Representation; import org.restlet.resource.Put; diff --git a/solr/core/src/java/org/apache/solr/rest/RestManager.java b/solr/core/src/java/org/apache/solr/rest/RestManager.java index e5419d8a563..b6dd9c9fc9d 100644 --- a/solr/core/src/java/org/apache/solr/rest/RestManager.java +++ b/solr/core/src/java/org/apache/solr/rest/RestManager.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.rest; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.rest; import java.io.FileNotFoundException; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/java/org/apache/solr/rest/SolrSchemaRestApi.java b/solr/core/src/java/org/apache/solr/rest/SolrSchemaRestApi.java index 258fdf81452..0e40f73c8b2 100644 --- a/solr/core/src/java/org/apache/solr/rest/SolrSchemaRestApi.java +++ b/solr/core/src/java/org/apache/solr/rest/SolrSchemaRestApi.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.rest; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.rest; import org.apache.solr.request.SolrRequestInfo; import org.apache.solr.rest.schema.CopyFieldCollectionResource; import org.apache.solr.rest.schema.DynamicFieldCollectionResource; diff --git a/solr/core/src/java/org/apache/solr/rest/package-info.java b/solr/core/src/java/org/apache/solr/rest/package-info.java index b903928ee4e..f6ae8756c2f 100644 --- a/solr/core/src/java/org/apache/solr/rest/package-info.java +++ b/solr/core/src/java/org/apache/solr/rest/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Solr RESTful APIs via Restlet. */ diff --git a/solr/core/src/java/org/apache/solr/rest/schema/BaseFieldResource.java b/solr/core/src/java/org/apache/solr/rest/schema/BaseFieldResource.java index 51f10866258..25f631d5e89 100644 --- a/solr/core/src/java/org/apache/solr/rest/schema/BaseFieldResource.java +++ b/solr/core/src/java/org/apache/solr/rest/schema/BaseFieldResource.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.rest.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.rest.schema; import org.apache.solr.cloud.ZkSolrResourceLoader; import org.apache.solr.common.params.CommonParams; import org.apache.solr.common.util.SimpleOrderedMap; diff --git a/solr/core/src/java/org/apache/solr/rest/schema/BaseFieldTypeResource.java b/solr/core/src/java/org/apache/solr/rest/schema/BaseFieldTypeResource.java index 19bf6657952..c475dd0c323 100644 --- a/solr/core/src/java/org/apache/solr/rest/schema/BaseFieldTypeResource.java +++ b/solr/core/src/java/org/apache/solr/rest/schema/BaseFieldTypeResource.java @@ -1,5 +1,3 @@ -package org.apache.solr.rest.schema; - /* * 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.rest.schema; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.rest.schema; import org.apache.solr.cloud.ZkSolrResourceLoader; import org.apache.solr.common.util.SimpleOrderedMap; diff --git a/solr/core/src/java/org/apache/solr/rest/schema/CopyFieldCollectionResource.java b/solr/core/src/java/org/apache/solr/rest/schema/CopyFieldCollectionResource.java index 61c0ca48a9d..610c0542af9 100644 --- a/solr/core/src/java/org/apache/solr/rest/schema/CopyFieldCollectionResource.java +++ b/solr/core/src/java/org/apache/solr/rest/schema/CopyFieldCollectionResource.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,8 +14,7 @@ package org.apache.solr.rest.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - - +package org.apache.solr.rest.schema; import org.apache.solr.common.SolrException; import org.apache.solr.common.params.CommonParams; import org.apache.solr.rest.GETable; diff --git a/solr/core/src/java/org/apache/solr/rest/schema/DynamicFieldCollectionResource.java b/solr/core/src/java/org/apache/solr/rest/schema/DynamicFieldCollectionResource.java index cd49ca2162a..bf9423404b7 100644 --- a/solr/core/src/java/org/apache/solr/rest/schema/DynamicFieldCollectionResource.java +++ b/solr/core/src/java/org/apache/solr/rest/schema/DynamicFieldCollectionResource.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.rest.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.rest.schema; import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException.ErrorCode; import org.apache.solr.common.params.CommonParams; diff --git a/solr/core/src/java/org/apache/solr/rest/schema/DynamicFieldResource.java b/solr/core/src/java/org/apache/solr/rest/schema/DynamicFieldResource.java index 207b16d6875..bf67608cc49 100644 --- a/solr/core/src/java/org/apache/solr/rest/schema/DynamicFieldResource.java +++ b/solr/core/src/java/org/apache/solr/rest/schema/DynamicFieldResource.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,8 +14,7 @@ package org.apache.solr.rest.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - - +package org.apache.solr.rest.schema; import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException.ErrorCode; import org.apache.solr.rest.GETable; diff --git a/solr/core/src/java/org/apache/solr/rest/schema/FieldCollectionResource.java b/solr/core/src/java/org/apache/solr/rest/schema/FieldCollectionResource.java index c27b3b5fcb1..f1bf6a4d372 100644 --- a/solr/core/src/java/org/apache/solr/rest/schema/FieldCollectionResource.java +++ b/solr/core/src/java/org/apache/solr/rest/schema/FieldCollectionResource.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,8 +14,7 @@ package org.apache.solr.rest.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - - +package org.apache.solr.rest.schema; import org.apache.solr.cloud.ZkSolrResourceLoader; import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException.ErrorCode; diff --git a/solr/core/src/java/org/apache/solr/rest/schema/FieldResource.java b/solr/core/src/java/org/apache/solr/rest/schema/FieldResource.java index 4a6be53ddac..2634bbdb759 100644 --- a/solr/core/src/java/org/apache/solr/rest/schema/FieldResource.java +++ b/solr/core/src/java/org/apache/solr/rest/schema/FieldResource.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.rest.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.rest.schema; import org.apache.solr.cloud.ZkSolrResourceLoader; import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException.ErrorCode; diff --git a/solr/core/src/java/org/apache/solr/rest/schema/FieldTypeCollectionResource.java b/solr/core/src/java/org/apache/solr/rest/schema/FieldTypeCollectionResource.java index e93c9269f84..d2eb1bd812d 100644 --- a/solr/core/src/java/org/apache/solr/rest/schema/FieldTypeCollectionResource.java +++ b/solr/core/src/java/org/apache/solr/rest/schema/FieldTypeCollectionResource.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.rest.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.rest.schema; import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException.ErrorCode; import org.apache.solr.common.util.SimpleOrderedMap; diff --git a/solr/core/src/java/org/apache/solr/rest/schema/FieldTypeResource.java b/solr/core/src/java/org/apache/solr/rest/schema/FieldTypeResource.java index 175df90958f..361c8c216ba 100644 --- a/solr/core/src/java/org/apache/solr/rest/schema/FieldTypeResource.java +++ b/solr/core/src/java/org/apache/solr/rest/schema/FieldTypeResource.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.rest.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.rest.schema; import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException.ErrorCode; import org.apache.solr.rest.GETable; diff --git a/solr/core/src/java/org/apache/solr/rest/schema/FieldTypeXmlAdapter.java b/solr/core/src/java/org/apache/solr/rest/schema/FieldTypeXmlAdapter.java index 8ab7561089b..a6740405bc3 100644 --- a/solr/core/src/java/org/apache/solr/rest/schema/FieldTypeXmlAdapter.java +++ b/solr/core/src/java/org/apache/solr/rest/schema/FieldTypeXmlAdapter.java @@ -1,5 +1,3 @@ -package org.apache.solr.rest.schema; - /* * 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.rest.schema; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.rest.schema; import java.util.List; import java.util.Map; diff --git a/solr/core/src/java/org/apache/solr/rest/schema/analysis/BaseManagedTokenFilterFactory.java b/solr/core/src/java/org/apache/solr/rest/schema/analysis/BaseManagedTokenFilterFactory.java index e8c969d9edb..888ceb24840 100644 --- a/solr/core/src/java/org/apache/solr/rest/schema/analysis/BaseManagedTokenFilterFactory.java +++ b/solr/core/src/java/org/apache/solr/rest/schema/analysis/BaseManagedTokenFilterFactory.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest.schema.analysis; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.rest.schema.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.rest.schema.analysis; import java.io.IOException; import java.util.Map; diff --git a/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedStopFilterFactory.java b/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedStopFilterFactory.java index 2d35bb3e053..853cf8532a3 100644 --- a/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedStopFilterFactory.java +++ b/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedStopFilterFactory.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest.schema.analysis; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.rest.schema.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.rest.schema.analysis; import java.util.Map; import java.util.Set; diff --git a/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedSynonymFilterFactory.java b/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedSynonymFilterFactory.java index 50d40b89286..0edaa693f96 100644 --- a/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedSynonymFilterFactory.java +++ b/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedSynonymFilterFactory.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest.schema.analysis; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.rest.schema.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.rest.schema.analysis; import java.io.IOException; import java.io.Reader; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedWordSetResource.java b/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedWordSetResource.java index 85e101b015b..d6b41e5f969 100644 --- a/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedWordSetResource.java +++ b/solr/core/src/java/org/apache/solr/rest/schema/analysis/ManagedWordSetResource.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest.schema.analysis; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.rest.schema.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.rest.schema.analysis; import java.lang.invoke.MethodHandles; import java.util.ArrayList; import java.util.Collections; diff --git a/solr/core/src/java/org/apache/solr/rest/schema/analysis/package-info.java b/solr/core/src/java/org/apache/solr/rest/schema/analysis/package-info.java index 04d4428c3e6..dc152d2c364 100644 --- a/solr/core/src/java/org/apache/solr/rest/schema/analysis/package-info.java +++ b/solr/core/src/java/org/apache/solr/rest/schema/analysis/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Analysis-related functionality for RESTful API access to the Solr Schema using Restlet. */ diff --git a/solr/core/src/java/org/apache/solr/rest/schema/package-info.java b/solr/core/src/java/org/apache/solr/rest/schema/package-info.java index ca5fd2c6312..5b47e692472 100644 --- a/solr/core/src/java/org/apache/solr/rest/schema/package-info.java +++ b/solr/core/src/java/org/apache/solr/rest/schema/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Provides RESTful API access to the Solr Schema using Restlet. */ diff --git a/solr/core/src/java/org/apache/solr/schema/AbstractSpatialFieldType.java b/solr/core/src/java/org/apache/solr/schema/AbstractSpatialFieldType.java index 76f97bc362c..c86f69153da 100644 --- a/solr/core/src/java/org/apache/solr/schema/AbstractSpatialFieldType.java +++ b/solr/core/src/java/org/apache/solr/schema/AbstractSpatialFieldType.java @@ -1,5 +1,3 @@ -package org.apache.solr.schema; - /* * 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.schema; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.schema; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/java/org/apache/solr/schema/AbstractSpatialPrefixTreeFieldType.java b/solr/core/src/java/org/apache/solr/schema/AbstractSpatialPrefixTreeFieldType.java index 6a5d929c43f..164398b48dd 100644 --- a/solr/core/src/java/org/apache/solr/schema/AbstractSpatialPrefixTreeFieldType.java +++ b/solr/core/src/java/org/apache/solr/schema/AbstractSpatialPrefixTreeFieldType.java @@ -1,5 +1,3 @@ -package org.apache.solr.schema; - /* * 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.schema; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.schema; import java.io.IOException; import java.io.Reader; diff --git a/solr/core/src/java/org/apache/solr/schema/AbstractSubTypeFieldType.java b/solr/core/src/java/org/apache/solr/schema/AbstractSubTypeFieldType.java index bdac4066e52..11848769e52 100644 --- a/solr/core/src/java/org/apache/solr/schema/AbstractSubTypeFieldType.java +++ b/solr/core/src/java/org/apache/solr/schema/AbstractSubTypeFieldType.java @@ -1,4 +1,3 @@ -package org.apache.solr.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.schema; import org.apache.solr.common.SolrException; import org.apache.solr.common.params.MapSolrParams; import org.apache.solr.common.params.SolrParams; diff --git a/solr/core/src/java/org/apache/solr/schema/BBoxField.java b/solr/core/src/java/org/apache/solr/schema/BBoxField.java index e864e83f32f..2f282c85549 100644 --- a/solr/core/src/java/org/apache/solr/schema/BBoxField.java +++ b/solr/core/src/java/org/apache/solr/schema/BBoxField.java @@ -1,5 +1,3 @@ -package org.apache.solr.schema; - /* * 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.schema; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.schema; import java.util.ArrayList; import java.util.Arrays; diff --git a/solr/core/src/java/org/apache/solr/schema/BinaryField.java b/solr/core/src/java/org/apache/solr/schema/BinaryField.java index b45d425117b..4e5bfee25c4 100644 --- a/solr/core/src/java/org/apache/solr/schema/BinaryField.java +++ b/solr/core/src/java/org/apache/solr/schema/BinaryField.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/schema/BoolField.java b/solr/core/src/java/org/apache/solr/schema/BoolField.java index b65af965a2c..f86a6a327ce 100644 --- a/solr/core/src/java/org/apache/solr/schema/BoolField.java +++ b/solr/core/src/java/org/apache/solr/schema/BoolField.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/schema/ClassicIndexSchemaFactory.java b/solr/core/src/java/org/apache/solr/schema/ClassicIndexSchemaFactory.java index 0604aae084b..5bca9c4c38f 100644 --- a/solr/core/src/java/org/apache/solr/schema/ClassicIndexSchemaFactory.java +++ b/solr/core/src/java/org/apache/solr/schema/ClassicIndexSchemaFactory.java @@ -1,4 +1,3 @@ -package org.apache.solr.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.schema; import java.lang.invoke.MethodHandles; import org.apache.solr.common.SolrException; diff --git a/solr/core/src/java/org/apache/solr/schema/CollationField.java b/solr/core/src/java/org/apache/solr/schema/CollationField.java index 04990036319..ad6d8723da3 100644 --- a/solr/core/src/java/org/apache/solr/schema/CollationField.java +++ b/solr/core/src/java/org/apache/solr/schema/CollationField.java @@ -1,5 +1,3 @@ -package org.apache.solr.schema; - /* * 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.schema; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.schema; import java.io.IOException; import java.io.InputStream; diff --git a/solr/core/src/java/org/apache/solr/schema/CoordinateFieldType.java b/solr/core/src/java/org/apache/solr/schema/CoordinateFieldType.java index 702c2517c5e..9f3aa50e2e0 100644 --- a/solr/core/src/java/org/apache/solr/schema/CoordinateFieldType.java +++ b/solr/core/src/java/org/apache/solr/schema/CoordinateFieldType.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; /** diff --git a/solr/core/src/java/org/apache/solr/schema/CopyField.java b/solr/core/src/java/org/apache/solr/schema/CopyField.java index cc7dd4ac79e..bb9e3f7be55 100644 --- a/solr/core/src/java/org/apache/solr/schema/CopyField.java +++ b/solr/core/src/java/org/apache/solr/schema/CopyField.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; /** diff --git a/solr/core/src/java/org/apache/solr/schema/CurrencyField.java b/solr/core/src/java/org/apache/solr/schema/CurrencyField.java index 427b039308c..b1047e38a10 100644 --- a/solr/core/src/java/org/apache/solr/schema/CurrencyField.java +++ b/solr/core/src/java/org/apache/solr/schema/CurrencyField.java @@ -1,4 +1,3 @@ -package org.apache.solr.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.schema; import java.io.IOException; import java.io.InputStream; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/java/org/apache/solr/schema/DateRangeField.java b/solr/core/src/java/org/apache/solr/schema/DateRangeField.java index 2e6f93d6817..38b68005ce0 100644 --- a/solr/core/src/java/org/apache/solr/schema/DateRangeField.java +++ b/solr/core/src/java/org/apache/solr/schema/DateRangeField.java @@ -1,5 +1,3 @@ -package org.apache.solr.schema; - /* * 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.schema; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.schema; import java.text.ParseException; import java.util.Calendar; diff --git a/solr/core/src/java/org/apache/solr/schema/DateValueFieldType.java b/solr/core/src/java/org/apache/solr/schema/DateValueFieldType.java index c4e7984ec9c..e9f1352429c 100644 --- a/solr/core/src/java/org/apache/solr/schema/DateValueFieldType.java +++ b/solr/core/src/java/org/apache/solr/schema/DateValueFieldType.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; /** diff --git a/solr/core/src/java/org/apache/solr/schema/DoubleValueFieldType.java b/solr/core/src/java/org/apache/solr/schema/DoubleValueFieldType.java index ff9712e22db..a9c6e224559 100644 --- a/solr/core/src/java/org/apache/solr/schema/DoubleValueFieldType.java +++ b/solr/core/src/java/org/apache/solr/schema/DoubleValueFieldType.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; /** diff --git a/solr/core/src/java/org/apache/solr/schema/EnumField.java b/solr/core/src/java/org/apache/solr/schema/EnumField.java index e2529dd68bd..79d2b2564a8 100644 --- a/solr/core/src/java/org/apache/solr/schema/EnumField.java +++ b/solr/core/src/java/org/apache/solr/schema/EnumField.java @@ -1,5 +1,3 @@ -package org.apache.solr.schema; - /* * 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.schema; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.schema; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; diff --git a/solr/core/src/java/org/apache/solr/schema/ExchangeRateProvider.java b/solr/core/src/java/org/apache/solr/schema/ExchangeRateProvider.java index b0745e91ebf..3ffe5150b39 100644 --- a/solr/core/src/java/org/apache/solr/schema/ExchangeRateProvider.java +++ b/solr/core/src/java/org/apache/solr/schema/ExchangeRateProvider.java @@ -1,4 +1,3 @@ -package org.apache.solr.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.schema; import java.util.Map; import java.util.Set; diff --git a/solr/core/src/java/org/apache/solr/schema/ExternalFileFieldReloader.java b/solr/core/src/java/org/apache/solr/schema/ExternalFileFieldReloader.java index d4a6f56f5c5..b091d7788e4 100644 --- a/solr/core/src/java/org/apache/solr/schema/ExternalFileFieldReloader.java +++ b/solr/core/src/java/org/apache/solr/schema/ExternalFileFieldReloader.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; import org.apache.lucene.index.IndexReader; diff --git a/solr/core/src/java/org/apache/solr/schema/FieldProperties.java b/solr/core/src/java/org/apache/solr/schema/FieldProperties.java index fef1fea08d0..2b1a8bbe654 100644 --- a/solr/core/src/java/org/apache/solr/schema/FieldProperties.java +++ b/solr/core/src/java/org/apache/solr/schema/FieldProperties.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; import java.util.HashMap; diff --git a/solr/core/src/java/org/apache/solr/schema/FieldType.java b/solr/core/src/java/org/apache/solr/schema/FieldType.java index 1a8a5368c30..fbcebcda1b1 100644 --- a/solr/core/src/java/org/apache/solr/schema/FieldType.java +++ b/solr/core/src/java/org/apache/solr/schema/FieldType.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java b/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java index 80e39cd8d9c..f7e9b0e602f 100644 --- a/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java +++ b/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; import javax.xml.xpath.XPath; diff --git a/solr/core/src/java/org/apache/solr/schema/FloatValueFieldType.java b/solr/core/src/java/org/apache/solr/schema/FloatValueFieldType.java index 5606caf9053..abb07501720 100644 --- a/solr/core/src/java/org/apache/solr/schema/FloatValueFieldType.java +++ b/solr/core/src/java/org/apache/solr/schema/FloatValueFieldType.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; /** diff --git a/solr/core/src/java/org/apache/solr/schema/GeoHashField.java b/solr/core/src/java/org/apache/solr/schema/GeoHashField.java index 4a9676483e5..7deae5f9dde 100644 --- a/solr/core/src/java/org/apache/solr/schema/GeoHashField.java +++ b/solr/core/src/java/org/apache/solr/schema/GeoHashField.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/schema/IndexSchema.java b/solr/core/src/java/org/apache/solr/schema/IndexSchema.java index 55a729b2001..2284d66e77d 100644 --- a/solr/core/src/java/org/apache/solr/schema/IndexSchema.java +++ b/solr/core/src/java/org/apache/solr/schema/IndexSchema.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/schema/IndexSchemaFactory.java b/solr/core/src/java/org/apache/solr/schema/IndexSchemaFactory.java index 869eafeceb2..83750c3355b 100644 --- a/solr/core/src/java/org/apache/solr/schema/IndexSchemaFactory.java +++ b/solr/core/src/java/org/apache/solr/schema/IndexSchemaFactory.java @@ -1,4 +1,3 @@ -package org.apache.solr.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.schema; import org.apache.lucene.util.Version; import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException.ErrorCode; diff --git a/solr/core/src/java/org/apache/solr/schema/IntValueFieldType.java b/solr/core/src/java/org/apache/solr/schema/IntValueFieldType.java index 9cf81e17be5..695871f16ec 100644 --- a/solr/core/src/java/org/apache/solr/schema/IntValueFieldType.java +++ b/solr/core/src/java/org/apache/solr/schema/IntValueFieldType.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; /** diff --git a/solr/core/src/java/org/apache/solr/schema/JsonPreAnalyzedParser.java b/solr/core/src/java/org/apache/solr/schema/JsonPreAnalyzedParser.java index f687464880b..b58ac9159fa 100644 --- a/solr/core/src/java/org/apache/solr/schema/JsonPreAnalyzedParser.java +++ b/solr/core/src/java/org/apache/solr/schema/JsonPreAnalyzedParser.java @@ -1,3 +1,19 @@ +/* + * 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.schema; import java.io.IOException; @@ -33,23 +49,6 @@ import org.apache.solr.schema.PreAnalyzedField.PreAnalyzedParser; 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 JsonPreAnalyzedParser implements PreAnalyzedParser { private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); diff --git a/solr/core/src/java/org/apache/solr/schema/LatLonType.java b/solr/core/src/java/org/apache/solr/schema/LatLonType.java index 131989eadaf..8592c5aa058 100644 --- a/solr/core/src/java/org/apache/solr/schema/LatLonType.java +++ b/solr/core/src/java/org/apache/solr/schema/LatLonType.java @@ -1,4 +1,3 @@ -package org.apache.solr.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.schema; import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/solr/core/src/java/org/apache/solr/schema/LongValueFieldType.java b/solr/core/src/java/org/apache/solr/schema/LongValueFieldType.java index 55b8b5113da..b8815159e85 100644 --- a/solr/core/src/java/org/apache/solr/schema/LongValueFieldType.java +++ b/solr/core/src/java/org/apache/solr/schema/LongValueFieldType.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; /** diff --git a/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java b/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java index 9db41cd18ac..953a635297a 100644 --- a/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java +++ b/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java @@ -1,4 +1,3 @@ -package org.apache.solr.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.schema; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchemaFactory.java b/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchemaFactory.java index 4bfa447a367..b576ad07750 100644 --- a/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchemaFactory.java +++ b/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchemaFactory.java @@ -1,4 +1,3 @@ -package org.apache.solr.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.schema; import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/schema/NumericValueFieldType.java b/solr/core/src/java/org/apache/solr/schema/NumericValueFieldType.java index e2238299f02..2577ab8c2c9 100644 --- a/solr/core/src/java/org/apache/solr/schema/NumericValueFieldType.java +++ b/solr/core/src/java/org/apache/solr/schema/NumericValueFieldType.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; /** diff --git a/solr/core/src/java/org/apache/solr/schema/OpenExchangeRatesOrgProvider.java b/solr/core/src/java/org/apache/solr/schema/OpenExchangeRatesOrgProvider.java index 04418f8d5bf..1a7bfe6af0a 100644 --- a/solr/core/src/java/org/apache/solr/schema/OpenExchangeRatesOrgProvider.java +++ b/solr/core/src/java/org/apache/solr/schema/OpenExchangeRatesOrgProvider.java @@ -1,4 +1,3 @@ -package org.apache.solr.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.schema; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; diff --git a/solr/core/src/java/org/apache/solr/schema/PointType.java b/solr/core/src/java/org/apache/solr/schema/PointType.java index 9a222223803..93452318901 100644 --- a/solr/core/src/java/org/apache/solr/schema/PointType.java +++ b/solr/core/src/java/org/apache/solr/schema/PointType.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/schema/PreAnalyzedField.java b/solr/core/src/java/org/apache/solr/schema/PreAnalyzedField.java index 9f4aeed697d..95185d11032 100644 --- a/solr/core/src/java/org/apache/solr/schema/PreAnalyzedField.java +++ b/solr/core/src/java/org/apache/solr/schema/PreAnalyzedField.java @@ -1,4 +1,3 @@ -package org.apache.solr.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.schema; import java.io.IOException; import java.io.Reader; import java.io.StringReader; diff --git a/solr/core/src/java/org/apache/solr/schema/PrimitiveFieldType.java b/solr/core/src/java/org/apache/solr/schema/PrimitiveFieldType.java index a6767e7727a..a920f350beb 100644 --- a/solr/core/src/java/org/apache/solr/schema/PrimitiveFieldType.java +++ b/solr/core/src/java/org/apache/solr/schema/PrimitiveFieldType.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; import java.util.Map; diff --git a/solr/core/src/java/org/apache/solr/schema/RandomSortField.java b/solr/core/src/java/org/apache/solr/schema/RandomSortField.java index c094b3f6f89..0b4f17f27cd 100644 --- a/solr/core/src/java/org/apache/solr/schema/RandomSortField.java +++ b/solr/core/src/java/org/apache/solr/schema/RandomSortField.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/schema/RptWithGeometrySpatialField.java b/solr/core/src/java/org/apache/solr/schema/RptWithGeometrySpatialField.java index 30f565ef67e..55fcf73d868 100644 --- a/solr/core/src/java/org/apache/solr/schema/RptWithGeometrySpatialField.java +++ b/solr/core/src/java/org/apache/solr/schema/RptWithGeometrySpatialField.java @@ -1,5 +1,3 @@ -package org.apache.solr.schema; - /* * 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.schema; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.schema; import java.io.IOException; import java.lang.ref.WeakReference; diff --git a/solr/core/src/java/org/apache/solr/schema/SchemaAware.java b/solr/core/src/java/org/apache/solr/schema/SchemaAware.java index ad074a95ada..84120c35062 100644 --- a/solr/core/src/java/org/apache/solr/schema/SchemaAware.java +++ b/solr/core/src/java/org/apache/solr/schema/SchemaAware.java @@ -1,4 +1,3 @@ -package org.apache.solr.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,8 +14,7 @@ package org.apache.solr.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - - +package org.apache.solr.schema; /** * An interface that can be extended to provide a callback mechanism for * informing an {@link IndexSchema} instance of changes to it, dynamically diff --git a/solr/core/src/java/org/apache/solr/schema/SchemaField.java b/solr/core/src/java/org/apache/solr/schema/SchemaField.java index 324affee587..5aadeda4ed4 100644 --- a/solr/core/src/java/org/apache/solr/schema/SchemaField.java +++ b/solr/core/src/java/org/apache/solr/schema/SchemaField.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/schema/SchemaManager.java b/solr/core/src/java/org/apache/solr/schema/SchemaManager.java index 1c93deb8e55..e70b84ffc0f 100644 --- a/solr/core/src/java/org/apache/solr/schema/SchemaManager.java +++ b/solr/core/src/java/org/apache/solr/schema/SchemaManager.java @@ -1,5 +1,3 @@ -package org.apache.solr.schema; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,7 +14,7 @@ package org.apache.solr.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.schema; import org.apache.solr.cloud.ZkController; import org.apache.solr.cloud.ZkSolrResourceLoader; diff --git a/solr/core/src/java/org/apache/solr/schema/SimilarityFactory.java b/solr/core/src/java/org/apache/solr/schema/SimilarityFactory.java index 7e32e714e4c..c6b04bc5b88 100644 --- a/solr/core/src/java/org/apache/solr/schema/SimilarityFactory.java +++ b/solr/core/src/java/org/apache/solr/schema/SimilarityFactory.java @@ -1,4 +1,3 @@ -package org.apache.solr.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.schema; import org.apache.lucene.search.similarities.Similarity; import org.apache.solr.common.util.SimpleOrderedMap; import org.apache.solr.common.params.SolrParams; diff --git a/solr/core/src/java/org/apache/solr/schema/SimplePreAnalyzedParser.java b/solr/core/src/java/org/apache/solr/schema/SimplePreAnalyzedParser.java index 057837493d9..0757d033fdc 100644 --- a/solr/core/src/java/org/apache/solr/schema/SimplePreAnalyzedParser.java +++ b/solr/core/src/java/org/apache/solr/schema/SimplePreAnalyzedParser.java @@ -1,4 +1,3 @@ -package org.apache.solr.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.schema; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.Reader; diff --git a/solr/core/src/java/org/apache/solr/schema/SpatialPointVectorFieldType.java b/solr/core/src/java/org/apache/solr/schema/SpatialPointVectorFieldType.java index 2f93dc1d8af..99bf3febec2 100644 --- a/solr/core/src/java/org/apache/solr/schema/SpatialPointVectorFieldType.java +++ b/solr/core/src/java/org/apache/solr/schema/SpatialPointVectorFieldType.java @@ -1,5 +1,3 @@ -package org.apache.solr.schema; - /* * 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.schema; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.schema; import org.apache.lucene.spatial.vector.PointVectorStrategy; diff --git a/solr/core/src/java/org/apache/solr/schema/SpatialQueryable.java b/solr/core/src/java/org/apache/solr/schema/SpatialQueryable.java index b4a769a2418..8d0c07216e7 100644 --- a/solr/core/src/java/org/apache/solr/schema/SpatialQueryable.java +++ b/solr/core/src/java/org/apache/solr/schema/SpatialQueryable.java @@ -1,4 +1,3 @@ -package org.apache.solr.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,8 +14,7 @@ package org.apache.solr.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - - +package org.apache.solr.schema; import org.apache.lucene.search.Query; import org.apache.solr.search.QParser; import org.apache.solr.search.SpatialOptions; diff --git a/solr/core/src/java/org/apache/solr/schema/SpatialRecursivePrefixTreeFieldType.java b/solr/core/src/java/org/apache/solr/schema/SpatialRecursivePrefixTreeFieldType.java index 4e6df22f474..c32d9f8366d 100644 --- a/solr/core/src/java/org/apache/solr/schema/SpatialRecursivePrefixTreeFieldType.java +++ b/solr/core/src/java/org/apache/solr/schema/SpatialRecursivePrefixTreeFieldType.java @@ -1,5 +1,3 @@ -package org.apache.solr.schema; - /* * 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.schema; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.schema; import java.util.Map; diff --git a/solr/core/src/java/org/apache/solr/schema/SpatialTermQueryPrefixTreeFieldType.java b/solr/core/src/java/org/apache/solr/schema/SpatialTermQueryPrefixTreeFieldType.java index f790aa6d2c2..1779f01dab8 100644 --- a/solr/core/src/java/org/apache/solr/schema/SpatialTermQueryPrefixTreeFieldType.java +++ b/solr/core/src/java/org/apache/solr/schema/SpatialTermQueryPrefixTreeFieldType.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; import org.apache.lucene.spatial.prefix.TermQueryPrefixTreeStrategy; diff --git a/solr/core/src/java/org/apache/solr/schema/StrField.java b/solr/core/src/java/org/apache/solr/schema/StrField.java index c7048f8957b..8aa8ecfff06 100644 --- a/solr/core/src/java/org/apache/solr/schema/StrField.java +++ b/solr/core/src/java/org/apache/solr/schema/StrField.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/schema/StrFieldSource.java b/solr/core/src/java/org/apache/solr/schema/StrFieldSource.java index 9310ed118a1..f2a5075db4a 100644 --- a/solr/core/src/java/org/apache/solr/schema/StrFieldSource.java +++ b/solr/core/src/java/org/apache/solr/schema/StrFieldSource.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; import org.apache.lucene.index.LeafReaderContext; diff --git a/solr/core/src/java/org/apache/solr/schema/TextField.java b/solr/core/src/java/org/apache/solr/schema/TextField.java index af03c2ea0de..3a05bec7c5c 100644 --- a/solr/core/src/java/org/apache/solr/schema/TextField.java +++ b/solr/core/src/java/org/apache/solr/schema/TextField.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute; diff --git a/solr/core/src/java/org/apache/solr/schema/TrieDateField.java b/solr/core/src/java/org/apache/solr/schema/TrieDateField.java index 5a2d92682c7..ccaf8213a95 100644 --- a/solr/core/src/java/org/apache/solr/schema/TrieDateField.java +++ b/solr/core/src/java/org/apache/solr/schema/TrieDateField.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; import java.util.Date; diff --git a/solr/core/src/java/org/apache/solr/schema/TrieDoubleField.java b/solr/core/src/java/org/apache/solr/schema/TrieDoubleField.java index 78ff8fde46c..f867655ec48 100644 --- a/solr/core/src/java/org/apache/solr/schema/TrieDoubleField.java +++ b/solr/core/src/java/org/apache/solr/schema/TrieDoubleField.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/schema/TrieFloatField.java b/solr/core/src/java/org/apache/solr/schema/TrieFloatField.java index 2b3f7413f11..4156aa6d257 100644 --- a/solr/core/src/java/org/apache/solr/schema/TrieFloatField.java +++ b/solr/core/src/java/org/apache/solr/schema/TrieFloatField.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/schema/TrieIntField.java b/solr/core/src/java/org/apache/solr/schema/TrieIntField.java index 6ef7b893547..2a953b378e5 100644 --- a/solr/core/src/java/org/apache/solr/schema/TrieIntField.java +++ b/solr/core/src/java/org/apache/solr/schema/TrieIntField.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/schema/TrieLongField.java b/solr/core/src/java/org/apache/solr/schema/TrieLongField.java index d255a3ad7df..54239bd27b1 100644 --- a/solr/core/src/java/org/apache/solr/schema/TrieLongField.java +++ b/solr/core/src/java/org/apache/solr/schema/TrieLongField.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/schema/UUIDField.java b/solr/core/src/java/org/apache/solr/schema/UUIDField.java index 73216ab28aa..e83359c8590 100644 --- a/solr/core/src/java/org/apache/solr/schema/UUIDField.java +++ b/solr/core/src/java/org/apache/solr/schema/UUIDField.java @@ -1,5 +1,3 @@ -package org.apache.solr.schema; - /* * 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.schema; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.schema; import java.io.IOException; import java.util.Locale; diff --git a/solr/core/src/java/org/apache/solr/schema/ZkIndexSchemaReader.java b/solr/core/src/java/org/apache/solr/schema/ZkIndexSchemaReader.java index 89818aa2806..db1bad8a7f1 100644 --- a/solr/core/src/java/org/apache/solr/schema/ZkIndexSchemaReader.java +++ b/solr/core/src/java/org/apache/solr/schema/ZkIndexSchemaReader.java @@ -1,4 +1,3 @@ -package org.apache.solr.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.schema; import org.apache.solr.cloud.ZkSolrResourceLoader; import org.apache.solr.common.SolrException.ErrorCode; import org.apache.solr.common.cloud.OnReconnect; diff --git a/solr/core/src/java/org/apache/solr/schema/package-info.java b/solr/core/src/java/org/apache/solr/schema/package-info.java index 83d7ede7ce4..ba77af6013d 100644 --- a/solr/core/src/java/org/apache/solr/schema/package-info.java +++ b/solr/core/src/java/org/apache/solr/schema/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * {@link org.apache.solr.schema.IndexSchema} and {@link org.apache.solr.schema.FieldType} implementations for powering schema.xml diff --git a/solr/core/src/java/org/apache/solr/search/AnalyticsQuery.java b/solr/core/src/java/org/apache/solr/search/AnalyticsQuery.java index f9580d66e51..1928c26ecce 100644 --- a/solr/core/src/java/org/apache/solr/search/AnalyticsQuery.java +++ b/solr/core/src/java/org/apache/solr/search/AnalyticsQuery.java @@ -1,20 +1,19 @@ /* -* 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. -*/ - + * 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.search; import org.apache.lucene.search.IndexSearcher; diff --git a/solr/core/src/java/org/apache/solr/search/BitDocSet.java b/solr/core/src/java/org/apache/solr/search/BitDocSet.java index 5f4ee223a52..56c19bbf086 100644 --- a/solr/core/src/java/org/apache/solr/search/BitDocSet.java +++ b/solr/core/src/java/org/apache/solr/search/BitDocSet.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import java.util.Collection; diff --git a/solr/core/src/java/org/apache/solr/search/BitsFilteredDocIdSet.java b/solr/core/src/java/org/apache/solr/search/BitsFilteredDocIdSet.java index 6aa53e67a4f..df38fe8a8be 100644 --- a/solr/core/src/java/org/apache/solr/search/BitsFilteredDocIdSet.java +++ b/solr/core/src/java/org/apache/solr/search/BitsFilteredDocIdSet.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * 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.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; import java.util.Objects; diff --git a/solr/core/src/java/org/apache/solr/search/BitsFilteredPostingsEnum.java b/solr/core/src/java/org/apache/solr/search/BitsFilteredPostingsEnum.java index f93709b53e3..4bdf1830351 100644 --- a/solr/core/src/java/org/apache/solr/search/BitsFilteredPostingsEnum.java +++ b/solr/core/src/java/org/apache/solr/search/BitsFilteredPostingsEnum.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * 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.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/search/CacheConfig.java b/solr/core/src/java/org/apache/solr/search/CacheConfig.java index 04d2483acff..40e54dccb4e 100644 --- a/solr/core/src/java/org/apache/solr/search/CacheConfig.java +++ b/solr/core/src/java/org/apache/solr/search/CacheConfig.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import javax.xml.xpath.XPathConstants; diff --git a/solr/core/src/java/org/apache/solr/search/CacheRegenerator.java b/solr/core/src/java/org/apache/solr/search/CacheRegenerator.java index f32830be565..4daaa525909 100644 --- a/solr/core/src/java/org/apache/solr/search/CacheRegenerator.java +++ b/solr/core/src/java/org/apache/solr/search/CacheRegenerator.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java index cc7e6dad540..f4a0fbf518b 100644 --- a/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java +++ b/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/search/ComplexPhraseQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/ComplexPhraseQParserPlugin.java index 51d819efdea..2904de9e4c3 100644 --- a/solr/core/src/java/org/apache/solr/search/ComplexPhraseQParserPlugin.java +++ b/solr/core/src/java/org/apache/solr/search/ComplexPhraseQParserPlugin.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * 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.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; import org.apache.lucene.queryparser.classic.ParseException; import org.apache.lucene.queryparser.complexPhrase.ComplexPhraseQueryParser; diff --git a/solr/core/src/java/org/apache/solr/search/CursorMark.java b/solr/core/src/java/org/apache/solr/search/CursorMark.java index 5b3f5cf83f2..9d2e20dd4d3 100644 --- a/solr/core/src/java/org/apache/solr/search/CursorMark.java +++ b/solr/core/src/java/org/apache/solr/search/CursorMark.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import org.apache.lucene.search.FieldDoc; diff --git a/solr/core/src/java/org/apache/solr/search/DelegatingCollector.java b/solr/core/src/java/org/apache/solr/search/DelegatingCollector.java index 50ae564eb1d..ca66dc3c279 100644 --- a/solr/core/src/java/org/apache/solr/search/DelegatingCollector.java +++ b/solr/core/src/java/org/apache/solr/search/DelegatingCollector.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; diff --git a/solr/core/src/java/org/apache/solr/search/DocIterator.java b/solr/core/src/java/org/apache/solr/search/DocIterator.java index 08e5835e48a..ce5ba750f81 100644 --- a/solr/core/src/java/org/apache/solr/search/DocIterator.java +++ b/solr/core/src/java/org/apache/solr/search/DocIterator.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import java.util.Iterator; diff --git a/solr/core/src/java/org/apache/solr/search/DocList.java b/solr/core/src/java/org/apache/solr/search/DocList.java index 8ddaa971b4d..41f892abc5e 100644 --- a/solr/core/src/java/org/apache/solr/search/DocList.java +++ b/solr/core/src/java/org/apache/solr/search/DocList.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; diff --git a/solr/core/src/java/org/apache/solr/search/DocListAndSet.java b/solr/core/src/java/org/apache/solr/search/DocListAndSet.java index 6d55ea9ad41..8d8ba4fdd14 100644 --- a/solr/core/src/java/org/apache/solr/search/DocListAndSet.java +++ b/solr/core/src/java/org/apache/solr/search/DocListAndSet.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; diff --git a/solr/core/src/java/org/apache/solr/search/DocSet.java b/solr/core/src/java/org/apache/solr/search/DocSet.java index 8f6b4f30a4e..91d8e108886 100644 --- a/solr/core/src/java/org/apache/solr/search/DocSet.java +++ b/solr/core/src/java/org/apache/solr/search/DocSet.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import java.io.Closeable; diff --git a/solr/core/src/java/org/apache/solr/search/DocSetBase.java b/solr/core/src/java/org/apache/solr/search/DocSetBase.java index a37f049a3ab..3c59af64732 100644 --- a/solr/core/src/java/org/apache/solr/search/DocSetBase.java +++ b/solr/core/src/java/org/apache/solr/search/DocSetBase.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/search/DocSetBuilder.java b/solr/core/src/java/org/apache/solr/search/DocSetBuilder.java index c635005356e..a5ca0241095 100644 --- a/solr/core/src/java/org/apache/solr/search/DocSetBuilder.java +++ b/solr/core/src/java/org/apache/solr/search/DocSetBuilder.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * 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.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/search/DocSetCollector.java b/solr/core/src/java/org/apache/solr/search/DocSetCollector.java index 921339a18cf..8e529d925d4 100644 --- a/solr/core/src/java/org/apache/solr/search/DocSetCollector.java +++ b/solr/core/src/java/org/apache/solr/search/DocSetCollector.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * 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.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/search/DocSetProducer.java b/solr/core/src/java/org/apache/solr/search/DocSetProducer.java index c3db17cc56c..3c4162359bf 100644 --- a/solr/core/src/java/org/apache/solr/search/DocSetProducer.java +++ b/solr/core/src/java/org/apache/solr/search/DocSetProducer.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * 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.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/search/DocSetUtil.java b/solr/core/src/java/org/apache/solr/search/DocSetUtil.java index 8d141acc245..cc2393d2242 100644 --- a/solr/core/src/java/org/apache/solr/search/DocSetUtil.java +++ b/solr/core/src/java/org/apache/solr/search/DocSetUtil.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,7 +14,7 @@ package org.apache.solr.search; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.search; import java.io.IOException; import java.util.List; diff --git a/solr/core/src/java/org/apache/solr/search/DocSlice.java b/solr/core/src/java/org/apache/solr/search/DocSlice.java index 92a7e159550..b5d294656cd 100644 --- a/solr/core/src/java/org/apache/solr/search/DocSlice.java +++ b/solr/core/src/java/org/apache/solr/search/DocSlice.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import java.util.Arrays; diff --git a/solr/core/src/java/org/apache/solr/search/EarlyTerminatingCollector.java b/solr/core/src/java/org/apache/solr/search/EarlyTerminatingCollector.java index 7a90a462f68..5f8361ef426 100644 --- a/solr/core/src/java/org/apache/solr/search/EarlyTerminatingCollector.java +++ b/solr/core/src/java/org/apache/solr/search/EarlyTerminatingCollector.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * 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.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/search/EarlyTerminatingCollectorException.java b/solr/core/src/java/org/apache/solr/search/EarlyTerminatingCollectorException.java index 555ea423c11..717767798d3 100644 --- a/solr/core/src/java/org/apache/solr/search/EarlyTerminatingCollectorException.java +++ b/solr/core/src/java/org/apache/solr/search/EarlyTerminatingCollectorException.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.solr.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; + /** * Thrown by {@link EarlyTerminatingCollector} when the maximum to abort * the scoring / collection process early, when the specified maximum number diff --git a/solr/core/src/java/org/apache/solr/search/ExportQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/ExportQParserPlugin.java index 4ed3e3bd05d..aee667468d3 100644 --- a/solr/core/src/java/org/apache/solr/search/ExportQParserPlugin.java +++ b/solr/core/src/java/org/apache/solr/search/ExportQParserPlugin.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import org.apache.lucene.util.FixedBitSet; diff --git a/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java b/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java index dfa2a62e226..46712923443 100644 --- a/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java +++ b/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import java.util.ArrayList; diff --git a/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java index 41121bc4022..67784f243a8 100644 --- a/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java +++ b/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import org.apache.solr.common.params.SolrParams; diff --git a/solr/core/src/java/org/apache/solr/search/ExtendedQuery.java b/solr/core/src/java/org/apache/solr/search/ExtendedQuery.java index 7e7bbbac525..5d1c069ad3d 100644 --- a/solr/core/src/java/org/apache/solr/search/ExtendedQuery.java +++ b/solr/core/src/java/org/apache/solr/search/ExtendedQuery.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; /** The ExtendedQuery interface provides extra metadata to a query. diff --git a/solr/core/src/java/org/apache/solr/search/ExtendedQueryBase.java b/solr/core/src/java/org/apache/solr/search/ExtendedQueryBase.java index 4607bf58ba8..91192e1f6d6 100644 --- a/solr/core/src/java/org/apache/solr/search/ExtendedQueryBase.java +++ b/solr/core/src/java/org/apache/solr/search/ExtendedQueryBase.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import org.apache.lucene.search.Query; diff --git a/solr/core/src/java/org/apache/solr/search/FastLRUCache.java b/solr/core/src/java/org/apache/solr/search/FastLRUCache.java index 56fb9d014a9..2ae752ee46a 100644 --- a/solr/core/src/java/org/apache/solr/search/FastLRUCache.java +++ b/solr/core/src/java/org/apache/solr/search/FastLRUCache.java @@ -1,4 +1,3 @@ -package org.apache.solr.search; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.search; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.search; import org.apache.solr.common.SolrException; import org.apache.solr.util.ConcurrentLRUCache; import org.slf4j.Logger; diff --git a/solr/core/src/java/org/apache/solr/search/FieldParams.java b/solr/core/src/java/org/apache/solr/search/FieldParams.java index 728369c4328..3b70b3e9d65 100644 --- a/solr/core/src/java/org/apache/solr/search/FieldParams.java +++ b/solr/core/src/java/org/apache/solr/search/FieldParams.java @@ -1,4 +1,3 @@ -package org.apache.solr.search; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.search; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.search; /** * A class to hold "phrase slop" and "boost" parameters for pf, pf2, pf3 parameters **/ diff --git a/solr/core/src/java/org/apache/solr/search/Filter.java b/solr/core/src/java/org/apache/solr/search/Filter.java index fd0ed0420e8..0aa9417e1cb 100644 --- a/solr/core/src/java/org/apache/solr/search/Filter.java +++ b/solr/core/src/java/org/apache/solr/search/Filter.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * 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.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; import java.io.IOException; import java.util.Set; diff --git a/solr/core/src/java/org/apache/solr/search/FilteredDocIdSet.java b/solr/core/src/java/org/apache/solr/search/FilteredDocIdSet.java index 2cc61536174..108475e2e17 100644 --- a/solr/core/src/java/org/apache/solr/search/FilteredDocIdSet.java +++ b/solr/core/src/java/org/apache/solr/search/FilteredDocIdSet.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * 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.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; import java.io.IOException; import java.util.Collection; diff --git a/solr/core/src/java/org/apache/solr/search/FunctionRangeQuery.java b/solr/core/src/java/org/apache/solr/search/FunctionRangeQuery.java index 986272dd21b..a53d8ddebd4 100644 --- a/solr/core/src/java/org/apache/solr/search/FunctionRangeQuery.java +++ b/solr/core/src/java/org/apache/solr/search/FunctionRangeQuery.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/search/Grouping.java b/solr/core/src/java/org/apache/solr/search/Grouping.java index 77346f7394c..1ebf574d6b7 100644 --- a/solr/core/src/java/org/apache/solr/search/Grouping.java +++ b/solr/core/src/java/org/apache/solr/search/Grouping.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/search/HashDocSet.java b/solr/core/src/java/org/apache/solr/search/HashDocSet.java index bcab43d66e3..ee40f09de31 100644 --- a/solr/core/src/java/org/apache/solr/search/HashDocSet.java +++ b/solr/core/src/java/org/apache/solr/search/HashDocSet.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import java.util.Collection; diff --git a/solr/core/src/java/org/apache/solr/search/HashQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/HashQParserPlugin.java index 4f5c3a55bed..e15ce1c186f 100644 --- a/solr/core/src/java/org/apache/solr/search/HashQParserPlugin.java +++ b/solr/core/src/java/org/apache/solr/search/HashQParserPlugin.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/search/Insanity.java b/solr/core/src/java/org/apache/solr/search/Insanity.java index 11920a9b121..2a1edc71b16 100644 --- a/solr/core/src/java/org/apache/solr/search/Insanity.java +++ b/solr/core/src/java/org/apache/solr/search/Insanity.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * 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.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; import java.io.IOException; import java.util.ArrayList; diff --git a/solr/core/src/java/org/apache/solr/search/LFUCache.java b/solr/core/src/java/org/apache/solr/search/LFUCache.java index 3d658f440a5..9bf544b433e 100644 --- a/solr/core/src/java/org/apache/solr/search/LFUCache.java +++ b/solr/core/src/java/org/apache/solr/search/LFUCache.java @@ -1,4 +1,3 @@ -package org.apache.solr.search; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.search; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.search; import java.io.Serializable; import java.lang.invoke.MethodHandles; import java.net.URL; diff --git a/solr/core/src/java/org/apache/solr/search/LRUCache.java b/solr/core/src/java/org/apache/solr/search/LRUCache.java index a89db8e093d..4b7fc78c424 100644 --- a/solr/core/src/java/org/apache/solr/search/LRUCache.java +++ b/solr/core/src/java/org/apache/solr/search/LRUCache.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/java/org/apache/solr/search/NoOpRegenerator.java b/solr/core/src/java/org/apache/solr/search/NoOpRegenerator.java index 4dc5a54c64e..5ad587cd9da 100644 --- a/solr/core/src/java/org/apache/solr/search/NoOpRegenerator.java +++ b/solr/core/src/java/org/apache/solr/search/NoOpRegenerator.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * 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.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/search/PostFilter.java b/solr/core/src/java/org/apache/solr/search/PostFilter.java index 3cb48de6424..c14f87e1c44 100644 --- a/solr/core/src/java/org/apache/solr/search/PostFilter.java +++ b/solr/core/src/java/org/apache/solr/search/PostFilter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import org.apache.lucene.search.IndexSearcher; diff --git a/solr/core/src/java/org/apache/solr/search/QueryCommand.java b/solr/core/src/java/org/apache/solr/search/QueryCommand.java index 2f9d47dd975..129a5c2e1b7 100755 --- a/solr/core/src/java/org/apache/solr/search/QueryCommand.java +++ b/solr/core/src/java/org/apache/solr/search/QueryCommand.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * 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.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; import java.util.ArrayList; import java.util.List; diff --git a/solr/core/src/java/org/apache/solr/search/QueryContext.java b/solr/core/src/java/org/apache/solr/search/QueryContext.java index 6b44a32d612..e8e8eae8b9e 100644 --- a/solr/core/src/java/org/apache/solr/search/QueryContext.java +++ b/solr/core/src/java/org/apache/solr/search/QueryContext.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * 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.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; import java.io.Closeable; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/search/QueryParsing.java b/solr/core/src/java/org/apache/solr/search/QueryParsing.java index 4d0d28731e8..2f0a9c59945 100644 --- a/solr/core/src/java/org/apache/solr/search/QueryParsing.java +++ b/solr/core/src/java/org/apache/solr/search/QueryParsing.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import org.apache.lucene.index.Term; diff --git a/solr/core/src/java/org/apache/solr/search/QueryResult.java b/solr/core/src/java/org/apache/solr/search/QueryResult.java index ccce90d3c2d..c1d652818cf 100755 --- a/solr/core/src/java/org/apache/solr/search/QueryResult.java +++ b/solr/core/src/java/org/apache/solr/search/QueryResult.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * 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.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; /** * The result of a search. diff --git a/solr/core/src/java/org/apache/solr/search/QueryResultKey.java b/solr/core/src/java/org/apache/solr/search/QueryResultKey.java index 893ead73327..d42ba45f188 100644 --- a/solr/core/src/java/org/apache/solr/search/QueryResultKey.java +++ b/solr/core/src/java/org/apache/solr/search/QueryResultKey.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import org.apache.lucene.search.Query; diff --git a/solr/core/src/java/org/apache/solr/search/QueryUtils.java b/solr/core/src/java/org/apache/solr/search/QueryUtils.java index 8a4685cc964..7d3d47876e4 100644 --- a/solr/core/src/java/org/apache/solr/search/QueryUtils.java +++ b/solr/core/src/java/org/apache/solr/search/QueryUtils.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import org.apache.lucene.search.BooleanClause; diff --git a/solr/core/src/java/org/apache/solr/search/QueryWrapperFilter.java b/solr/core/src/java/org/apache/solr/search/QueryWrapperFilter.java index 80840a4b83b..264378b234a 100644 --- a/solr/core/src/java/org/apache/solr/search/QueryWrapperFilter.java +++ b/solr/core/src/java/org/apache/solr/search/QueryWrapperFilter.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * 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.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/search/RankQuery.java b/solr/core/src/java/org/apache/solr/search/RankQuery.java index 0a7a052f1e4..4812e4117a9 100644 --- a/solr/core/src/java/org/apache/solr/search/RankQuery.java +++ b/solr/core/src/java/org/apache/solr/search/RankQuery.java @@ -1,20 +1,19 @@ /* -* 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. -*/ - + * 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.search; import org.apache.lucene.search.IndexSearcher; diff --git a/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java index 21cca3ebb87..552acad040e 100644 --- a/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java +++ b/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/search/ScoreFilter.java b/solr/core/src/java/org/apache/solr/search/ScoreFilter.java index dfe51b5997a..f566ab1337a 100644 --- a/solr/core/src/java/org/apache/solr/search/ScoreFilter.java +++ b/solr/core/src/java/org/apache/solr/search/ScoreFilter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; public interface ScoreFilter { diff --git a/solr/core/src/java/org/apache/solr/search/SimpleQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/SimpleQParserPlugin.java index 2cab3c9c4c0..3daaec25193 100644 --- a/solr/core/src/java/org/apache/solr/search/SimpleQParserPlugin.java +++ b/solr/core/src/java/org/apache/solr/search/SimpleQParserPlugin.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * 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.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.index.Term; diff --git a/solr/core/src/java/org/apache/solr/search/SolrCache.java b/solr/core/src/java/org/apache/solr/search/SolrCache.java index e4613c49a09..9a2d0fc38e4 100644 --- a/solr/core/src/java/org/apache/solr/search/SolrCache.java +++ b/solr/core/src/java/org/apache/solr/search/SolrCache.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import org.apache.solr.core.SolrInfoMBean; diff --git a/solr/core/src/java/org/apache/solr/search/SolrCacheBase.java b/solr/core/src/java/org/apache/solr/search/SolrCacheBase.java index 3dbff0c0358..85caa90cfee 100644 --- a/solr/core/src/java/org/apache/solr/search/SolrCacheBase.java +++ b/solr/core/src/java/org/apache/solr/search/SolrCacheBase.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import java.math.BigDecimal; diff --git a/solr/core/src/java/org/apache/solr/search/SolrConstantScoreQuery.java b/solr/core/src/java/org/apache/solr/search/SolrConstantScoreQuery.java index fec517b4da5..c255dee8eda 100644 --- a/solr/core/src/java/org/apache/solr/search/SolrConstantScoreQuery.java +++ b/solr/core/src/java/org/apache/solr/search/SolrConstantScoreQuery.java @@ -1,19 +1,3 @@ -package org.apache.solr.search; - -import java.io.IOException; -import java.util.Map; - -import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.queries.function.ValueSource; -import org.apache.lucene.search.ConstantScoreScorer; -import org.apache.lucene.search.ConstantScoreWeight; -import org.apache.lucene.search.DocIdSet; -import org.apache.lucene.search.DocIdSetIterator; -import org.apache.lucene.search.IndexSearcher; -import org.apache.lucene.search.Query; -import org.apache.lucene.search.Scorer; -import org.apache.lucene.search.Weight; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -30,6 +14,21 @@ import org.apache.lucene.search.Weight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; + +import java.io.IOException; +import java.util.Map; + +import org.apache.lucene.index.LeafReaderContext; +import org.apache.lucene.queries.function.ValueSource; +import org.apache.lucene.search.ConstantScoreScorer; +import org.apache.lucene.search.ConstantScoreWeight; +import org.apache.lucene.search.DocIdSet; +import org.apache.lucene.search.DocIdSetIterator; +import org.apache.lucene.search.IndexSearcher; +import org.apache.lucene.search.Query; +import org.apache.lucene.search.Scorer; +import org.apache.lucene.search.Weight; /** * A query that wraps a filter and simply returns a constant score equal to the diff --git a/solr/core/src/java/org/apache/solr/search/SolrCoreParser.java b/solr/core/src/java/org/apache/solr/search/SolrCoreParser.java index 8d54beb8c79..cf3fb421954 100755 --- a/solr/core/src/java/org/apache/solr/search/SolrCoreParser.java +++ b/solr/core/src/java/org/apache/solr/search/SolrCoreParser.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * 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.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.queryparser.xml.CoreParser; diff --git a/solr/core/src/java/org/apache/solr/search/SolrFieldCacheMBean.java b/solr/core/src/java/org/apache/solr/search/SolrFieldCacheMBean.java index b01d6a0f188..46e35b53201 100644 --- a/solr/core/src/java/org/apache/solr/search/SolrFieldCacheMBean.java +++ b/solr/core/src/java/org/apache/solr/search/SolrFieldCacheMBean.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import java.net.URL; diff --git a/solr/core/src/java/org/apache/solr/search/SolrFilter.java b/solr/core/src/java/org/apache/solr/search/SolrFilter.java index f1798d3905a..f1bf5054c19 100644 --- a/solr/core/src/java/org/apache/solr/search/SolrFilter.java +++ b/solr/core/src/java/org/apache/solr/search/SolrFilter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import org.apache.lucene.index.LeafReaderContext; diff --git a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java index a8057e53279..66c4795e735 100644 --- a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java +++ b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import java.io.Closeable; diff --git a/solr/core/src/java/org/apache/solr/search/SolrQueryParser.java b/solr/core/src/java/org/apache/solr/search/SolrQueryParser.java index 21fbf5e61af..71d661d68f0 100644 --- a/solr/core/src/java/org/apache/solr/search/SolrQueryParser.java +++ b/solr/core/src/java/org/apache/solr/search/SolrQueryParser.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import java.util.EnumSet; diff --git a/solr/core/src/java/org/apache/solr/search/SolrQueryTimeoutImpl.java b/solr/core/src/java/org/apache/solr/search/SolrQueryTimeoutImpl.java index 919c773bb1e..c41b4165e64 100644 --- a/solr/core/src/java/org/apache/solr/search/SolrQueryTimeoutImpl.java +++ b/solr/core/src/java/org/apache/solr/search/SolrQueryTimeoutImpl.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * 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.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; import static java.lang.System.nanoTime; diff --git a/solr/core/src/java/org/apache/solr/search/SortSpec.java b/solr/core/src/java/org/apache/solr/search/SortSpec.java index 45db657f696..8cd954c0354 100644 --- a/solr/core/src/java/org/apache/solr/search/SortSpec.java +++ b/solr/core/src/java/org/apache/solr/search/SortSpec.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import org.apache.lucene.search.Sort; diff --git a/solr/core/src/java/org/apache/solr/search/SortSpecParsing.java b/solr/core/src/java/org/apache/solr/search/SortSpecParsing.java index 19231cdf8c7..3b87b52b500 100644 --- a/solr/core/src/java/org/apache/solr/search/SortSpecParsing.java +++ b/solr/core/src/java/org/apache/solr/search/SortSpecParsing.java @@ -1,19 +1,3 @@ -package org.apache.solr.search; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import org.apache.lucene.queries.function.FunctionQuery; -import org.apache.lucene.queries.function.valuesource.QueryValueSource; -import org.apache.lucene.search.Query; -import org.apache.lucene.search.Sort; -import org.apache.lucene.search.SortField; -import org.apache.solr.common.SolrException; -import org.apache.solr.request.SolrQueryRequest; -import org.apache.solr.schema.IndexSchema; -import org.apache.solr.schema.SchemaField; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -30,6 +14,21 @@ import org.apache.solr.schema.SchemaField; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.apache.lucene.queries.function.FunctionQuery; +import org.apache.lucene.queries.function.valuesource.QueryValueSource; +import org.apache.lucene.search.Query; +import org.apache.lucene.search.Sort; +import org.apache.lucene.search.SortField; +import org.apache.solr.common.SolrException; +import org.apache.solr.request.SolrQueryRequest; +import org.apache.solr.schema.IndexSchema; +import org.apache.solr.schema.SchemaField; public class SortSpecParsing { diff --git a/solr/core/src/java/org/apache/solr/search/SortedIntDocSet.java b/solr/core/src/java/org/apache/solr/search/SortedIntDocSet.java index 90aace0c89a..514d5129482 100644 --- a/solr/core/src/java/org/apache/solr/search/SortedIntDocSet.java +++ b/solr/core/src/java/org/apache/solr/search/SortedIntDocSet.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import java.util.Collection; diff --git a/solr/core/src/java/org/apache/solr/search/Sorting.java b/solr/core/src/java/org/apache/solr/search/Sorting.java index 5175ae040a5..8bb217111b5 100644 --- a/solr/core/src/java/org/apache/solr/search/Sorting.java +++ b/solr/core/src/java/org/apache/solr/search/Sorting.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import org.apache.lucene.search.*; diff --git a/solr/core/src/java/org/apache/solr/search/SpatialBoxQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/SpatialBoxQParserPlugin.java index 0f2bccbf524..977acd78af9 100644 --- a/solr/core/src/java/org/apache/solr/search/SpatialBoxQParserPlugin.java +++ b/solr/core/src/java/org/apache/solr/search/SpatialBoxQParserPlugin.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import org.apache.solr.common.params.SolrParams; diff --git a/solr/core/src/java/org/apache/solr/search/SpatialFilterQParser.java b/solr/core/src/java/org/apache/solr/search/SpatialFilterQParser.java index 5b6fa3d0ade..2097b2dde14 100644 --- a/solr/core/src/java/org/apache/solr/search/SpatialFilterQParser.java +++ b/solr/core/src/java/org/apache/solr/search/SpatialFilterQParser.java @@ -1,4 +1,3 @@ -package org.apache.solr.search; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,8 +14,7 @@ package org.apache.solr.search; * See the License for the specific language governing permissions and * limitations under the License. */ - - +package org.apache.solr.search; import org.apache.lucene.search.Query; import org.apache.solr.common.SolrException; import org.apache.solr.common.params.SolrParams; diff --git a/solr/core/src/java/org/apache/solr/search/SpatialFilterQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/SpatialFilterQParserPlugin.java index 7269bb5feff..2042dd02607 100644 --- a/solr/core/src/java/org/apache/solr/search/SpatialFilterQParserPlugin.java +++ b/solr/core/src/java/org/apache/solr/search/SpatialFilterQParserPlugin.java @@ -1,4 +1,3 @@ -package org.apache.solr.search; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.search; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.search; import org.apache.solr.common.params.SolrParams; import org.apache.solr.common.util.NamedList; import org.apache.solr.request.SolrQueryRequest; diff --git a/solr/core/src/java/org/apache/solr/search/SpatialOptions.java b/solr/core/src/java/org/apache/solr/search/SpatialOptions.java index 158fc7a0004..b1e4a24d114 100644 --- a/solr/core/src/java/org/apache/solr/search/SpatialOptions.java +++ b/solr/core/src/java/org/apache/solr/search/SpatialOptions.java @@ -1,4 +1,3 @@ -package org.apache.solr.search; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.search; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.search; import org.apache.solr.schema.SchemaField; /** diff --git a/solr/core/src/java/org/apache/solr/search/StrParser.java b/solr/core/src/java/org/apache/solr/search/StrParser.java index b20ff245483..344bea36366 100644 --- a/solr/core/src/java/org/apache/solr/search/StrParser.java +++ b/solr/core/src/java/org/apache/solr/search/StrParser.java @@ -1,7 +1,3 @@ -package org.apache.solr.search; - -import java.util.Locale; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import java.util.Locale; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; + +import java.util.Locale; /** * Simple class to help with parsing a string. diff --git a/solr/core/src/java/org/apache/solr/search/SurroundQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/SurroundQParserPlugin.java index c87c3f046d9..6c3ebe53648 100644 --- a/solr/core/src/java/org/apache/solr/search/SurroundQParserPlugin.java +++ b/solr/core/src/java/org/apache/solr/search/SurroundQParserPlugin.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,7 +14,7 @@ package org.apache.solr.search; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.search; import org.apache.lucene.search.Query; import org.apache.solr.common.params.CommonParams; diff --git a/solr/core/src/java/org/apache/solr/search/SyntaxError.java b/solr/core/src/java/org/apache/solr/search/SyntaxError.java index b26ca43f5d8..38fc71b2f15 100644 --- a/solr/core/src/java/org/apache/solr/search/SyntaxError.java +++ b/solr/core/src/java/org/apache/solr/search/SyntaxError.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; /** Simple checked exception for parsing errors */ diff --git a/solr/core/src/java/org/apache/solr/search/TermsQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/TermsQParserPlugin.java index 0233bf0bbb2..e6051c77672 100644 --- a/solr/core/src/java/org/apache/solr/search/TermsQParserPlugin.java +++ b/solr/core/src/java/org/apache/solr/search/TermsQParserPlugin.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * 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.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; import java.util.Arrays; import java.util.regex.Pattern; diff --git a/solr/core/src/java/org/apache/solr/search/WrappedQuery.java b/solr/core/src/java/org/apache/solr/search/WrappedQuery.java index c7dc5b55fb5..974c6e5c77a 100644 --- a/solr/core/src/java/org/apache/solr/search/WrappedQuery.java +++ b/solr/core/src/java/org/apache/solr/search/WrappedQuery.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import org.apache.lucene.index.IndexReader; diff --git a/solr/core/src/java/org/apache/solr/search/XmlQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/XmlQParserPlugin.java index 71f1fb8a25a..566cfa642ed 100755 --- a/solr/core/src/java/org/apache/solr/search/XmlQParserPlugin.java +++ b/solr/core/src/java/org/apache/solr/search/XmlQParserPlugin.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * 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.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; import java.io.ByteArrayInputStream; import java.nio.charset.StandardCharsets; diff --git a/solr/core/src/java/org/apache/solr/search/facet/AggValueSource.java b/solr/core/src/java/org/apache/solr/search/facet/AggValueSource.java index 0336e29bbf1..6fecd3c0e50 100644 --- a/solr/core/src/java/org/apache/solr/search/facet/AggValueSource.java +++ b/solr/core/src/java/org/apache/solr/search/facet/AggValueSource.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.facet; - /* * 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.search.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.facet; import java.io.IOException; import java.util.Map; diff --git a/solr/core/src/java/org/apache/solr/search/facet/AvgAgg.java b/solr/core/src/java/org/apache/solr/search/facet/AvgAgg.java index d6dd50b12ab..ebc6459dbab 100644 --- a/solr/core/src/java/org/apache/solr/search/facet/AvgAgg.java +++ b/solr/core/src/java/org/apache/solr/search/facet/AvgAgg.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.facet; - /* * 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.search.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.facet; import java.io.IOException; import java.util.List; diff --git a/solr/core/src/java/org/apache/solr/search/facet/BlockJoin.java b/solr/core/src/java/org/apache/solr/search/facet/BlockJoin.java index 6af62dec46e..377a370989f 100644 --- a/solr/core/src/java/org/apache/solr/search/facet/BlockJoin.java +++ b/solr/core/src/java/org/apache/solr/search/facet/BlockJoin.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.facet; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,7 +14,7 @@ package org.apache.solr.search.facet; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.search.facet; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/search/facet/CountAgg.java b/solr/core/src/java/org/apache/solr/search/facet/CountAgg.java index ff6fc384d3b..fc16917b2fa 100644 --- a/solr/core/src/java/org/apache/solr/search/facet/CountAgg.java +++ b/solr/core/src/java/org/apache/solr/search/facet/CountAgg.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.facet; - /* * 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.search.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.facet; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetDebugInfo.java b/solr/core/src/java/org/apache/solr/search/facet/FacetDebugInfo.java index eb61bd22909..52a1b2c7014 100644 --- a/solr/core/src/java/org/apache/solr/search/facet/FacetDebugInfo.java +++ b/solr/core/src/java/org/apache/solr/search/facet/FacetDebugInfo.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search.facet; import java.util.ArrayList; diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetField.java b/solr/core/src/java/org/apache/solr/search/facet/FacetField.java index f59caeaa5fb..a1f113196c3 100644 --- a/solr/core/src/java/org/apache/solr/search/facet/FacetField.java +++ b/solr/core/src/java/org/apache/solr/search/facet/FacetField.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.facet; - /* * 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.search.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.facet; import java.io.Closeable; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetFieldProcessorDV.java b/solr/core/src/java/org/apache/solr/search/facet/FacetFieldProcessorDV.java index 5bc3ef1071f..12056aa118a 100644 --- a/solr/core/src/java/org/apache/solr/search/facet/FacetFieldProcessorDV.java +++ b/solr/core/src/java/org/apache/solr/search/facet/FacetFieldProcessorDV.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.facet; - /* * 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.search.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.facet; import java.io.IOException; import java.util.Arrays; diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetFieldProcessorNumeric.java b/solr/core/src/java/org/apache/solr/search/facet/FacetFieldProcessorNumeric.java index 18f71b64091..1872eaddfd7 100644 --- a/solr/core/src/java/org/apache/solr/search/facet/FacetFieldProcessorNumeric.java +++ b/solr/core/src/java/org/apache/solr/search/facet/FacetFieldProcessorNumeric.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.facet; - /* * 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.search.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.facet; import java.io.IOException; import java.util.ArrayList; diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetMerger.java b/solr/core/src/java/org/apache/solr/search/facet/FacetMerger.java index 44f95c70135..a8573c03ad0 100644 --- a/solr/core/src/java/org/apache/solr/search/facet/FacetMerger.java +++ b/solr/core/src/java/org/apache/solr/search/facet/FacetMerger.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.facet; - /* * 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.search.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.facet; // // The FacetMerger code is in the prototype stage, and this is the reason that diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetModule.java b/solr/core/src/java/org/apache/solr/search/facet/FacetModule.java index 793e8676d13..e343cc60eeb 100644 --- a/solr/core/src/java/org/apache/solr/search/facet/FacetModule.java +++ b/solr/core/src/java/org/apache/solr/search/facet/FacetModule.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.facet; - /* * 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.search.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.facet; import java.io.IOException; import java.util.ArrayList; diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetProcessor.java b/solr/core/src/java/org/apache/solr/search/facet/FacetProcessor.java index 4b7ed2ce8f2..ba1aa44c9ca 100644 --- a/solr/core/src/java/org/apache/solr/search/facet/FacetProcessor.java +++ b/solr/core/src/java/org/apache/solr/search/facet/FacetProcessor.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.facet; - /* * 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.search.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.facet; import java.io.IOException; import java.util.ArrayList; diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetQuery.java b/solr/core/src/java/org/apache/solr/search/facet/FacetQuery.java index b668a6dbc2b..ac6d7f1c680 100644 --- a/solr/core/src/java/org/apache/solr/search/facet/FacetQuery.java +++ b/solr/core/src/java/org/apache/solr/search/facet/FacetQuery.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.facet; - /* * 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.search.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.facet; import java.io.IOException; import java.util.HashMap; diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetRange.java b/solr/core/src/java/org/apache/solr/search/facet/FacetRange.java index 2ead2221f77..1add47a5978 100644 --- a/solr/core/src/java/org/apache/solr/search/facet/FacetRange.java +++ b/solr/core/src/java/org/apache/solr/search/facet/FacetRange.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.facet; - /* * 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.search.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.facet; import java.io.IOException; import java.util.ArrayList; diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetRequest.java b/solr/core/src/java/org/apache/solr/search/facet/FacetRequest.java index 33ce5dcfb41..5c5624f4200 100644 --- a/solr/core/src/java/org/apache/solr/search/facet/FacetRequest.java +++ b/solr/core/src/java/org/apache/solr/search/facet/FacetRequest.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.facet; - /* * 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.search.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.facet; import java.util.EnumSet; import java.util.LinkedHashMap; diff --git a/solr/core/src/java/org/apache/solr/search/facet/FieldUtil.java b/solr/core/src/java/org/apache/solr/search/facet/FieldUtil.java index d65a7927d17..a0457b6cd22 100644 --- a/solr/core/src/java/org/apache/solr/search/facet/FieldUtil.java +++ b/solr/core/src/java/org/apache/solr/search/facet/FieldUtil.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.facet; - /* * 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.search.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.facet; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/search/facet/HLLAgg.java b/solr/core/src/java/org/apache/solr/search/facet/HLLAgg.java index 91a2133027a..4d766e314dc 100644 --- a/solr/core/src/java/org/apache/solr/search/facet/HLLAgg.java +++ b/solr/core/src/java/org/apache/solr/search/facet/HLLAgg.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.facet; - /* * 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.search.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.facet; import java.io.IOException; import java.util.ArrayList; diff --git a/solr/core/src/java/org/apache/solr/search/facet/LegacyFacet.java b/solr/core/src/java/org/apache/solr/search/facet/LegacyFacet.java index df4cd1db153..bdc274c3f0a 100644 --- a/solr/core/src/java/org/apache/solr/search/facet/LegacyFacet.java +++ b/solr/core/src/java/org/apache/solr/search/facet/LegacyFacet.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.facet; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,7 +14,7 @@ package org.apache.solr.search.facet; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.search.facet; import java.util.ArrayList; import java.util.Arrays; diff --git a/solr/core/src/java/org/apache/solr/search/facet/MaxAgg.java b/solr/core/src/java/org/apache/solr/search/facet/MaxAgg.java index 87dfd6adba0..a66e9689a63 100644 --- a/solr/core/src/java/org/apache/solr/search/facet/MaxAgg.java +++ b/solr/core/src/java/org/apache/solr/search/facet/MaxAgg.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.facet; - /* * 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.search.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.facet; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/search/facet/MinAgg.java b/solr/core/src/java/org/apache/solr/search/facet/MinAgg.java index 087d5cfa55f..72c758152a4 100644 --- a/solr/core/src/java/org/apache/solr/search/facet/MinAgg.java +++ b/solr/core/src/java/org/apache/solr/search/facet/MinAgg.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.facet; - /* * 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.search.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.facet; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/search/facet/PercentileAgg.java b/solr/core/src/java/org/apache/solr/search/facet/PercentileAgg.java index e2eb0bfdce8..6285b3911ba 100644 --- a/solr/core/src/java/org/apache/solr/search/facet/PercentileAgg.java +++ b/solr/core/src/java/org/apache/solr/search/facet/PercentileAgg.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.facet; - /* * 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.search.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.facet; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/solr/core/src/java/org/apache/solr/search/facet/SimpleAggValueSource.java b/solr/core/src/java/org/apache/solr/search/facet/SimpleAggValueSource.java index 19df3d61031..c9e3f588533 100644 --- a/solr/core/src/java/org/apache/solr/search/facet/SimpleAggValueSource.java +++ b/solr/core/src/java/org/apache/solr/search/facet/SimpleAggValueSource.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.facet; - /* * 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.search.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.facet; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.queries.function.FunctionValues; diff --git a/solr/core/src/java/org/apache/solr/search/facet/SlotAcc.java b/solr/core/src/java/org/apache/solr/search/facet/SlotAcc.java index 30e5485d8bc..fd54901f11b 100644 --- a/solr/core/src/java/org/apache/solr/search/facet/SlotAcc.java +++ b/solr/core/src/java/org/apache/solr/search/facet/SlotAcc.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.facet; - /* * 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.search.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.facet; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.MultiDocValues; diff --git a/solr/core/src/java/org/apache/solr/search/facet/StrAggValueSource.java b/solr/core/src/java/org/apache/solr/search/facet/StrAggValueSource.java index 61a90fd161e..232188dcdc6 100644 --- a/solr/core/src/java/org/apache/solr/search/facet/StrAggValueSource.java +++ b/solr/core/src/java/org/apache/solr/search/facet/StrAggValueSource.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.facet; - /* * 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.search.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.facet; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.queries.function.FunctionValues; diff --git a/solr/core/src/java/org/apache/solr/search/facet/SumAgg.java b/solr/core/src/java/org/apache/solr/search/facet/SumAgg.java index 5e3ecd872d8..7b7f34b5515 100644 --- a/solr/core/src/java/org/apache/solr/search/facet/SumAgg.java +++ b/solr/core/src/java/org/apache/solr/search/facet/SumAgg.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.facet; - /* * 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.search.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.facet; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/search/facet/SumsqAgg.java b/solr/core/src/java/org/apache/solr/search/facet/SumsqAgg.java index f511351304e..732ab14c1e0 100644 --- a/solr/core/src/java/org/apache/solr/search/facet/SumsqAgg.java +++ b/solr/core/src/java/org/apache/solr/search/facet/SumsqAgg.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.facet; - /* * 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.search.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.facet; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/search/facet/UnInvertedField.java b/solr/core/src/java/org/apache/solr/search/facet/UnInvertedField.java index 89b2318b7a2..9294792097a 100644 --- a/solr/core/src/java/org/apache/solr/search/facet/UnInvertedField.java +++ b/solr/core/src/java/org/apache/solr/search/facet/UnInvertedField.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search.facet; import java.io.Closeable; diff --git a/solr/core/src/java/org/apache/solr/search/facet/UniqueAgg.java b/solr/core/src/java/org/apache/solr/search/facet/UniqueAgg.java index 2ea752316f9..261ed60c2d2 100644 --- a/solr/core/src/java/org/apache/solr/search/facet/UniqueAgg.java +++ b/solr/core/src/java/org/apache/solr/search/facet/UniqueAgg.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.facet; - /* * 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.search.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.facet; import java.io.IOException; import java.util.ArrayList; diff --git a/solr/core/src/java/org/apache/solr/search/facet/UniqueSlotAcc.java b/solr/core/src/java/org/apache/solr/search/facet/UniqueSlotAcc.java index ca7d9b8e6b8..94532f7e206 100644 --- a/solr/core/src/java/org/apache/solr/search/facet/UniqueSlotAcc.java +++ b/solr/core/src/java/org/apache/solr/search/facet/UniqueSlotAcc.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.facet; - /* * 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.search.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.facet; import java.io.IOException; import java.util.ArrayList; diff --git a/solr/core/src/java/org/apache/solr/search/function/CollapseScoreFunction.java b/solr/core/src/java/org/apache/solr/search/function/CollapseScoreFunction.java index cb75490374d..5378ea0fd40 100644 --- a/solr/core/src/java/org/apache/solr/search/function/CollapseScoreFunction.java +++ b/solr/core/src/java/org/apache/solr/search/function/CollapseScoreFunction.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search.function; import org.apache.lucene.index.LeafReaderContext; diff --git a/solr/core/src/java/org/apache/solr/search/function/OrdFieldSource.java b/solr/core/src/java/org/apache/solr/search/function/OrdFieldSource.java index 194bec5b6c1..8a9d6950138 100644 --- a/solr/core/src/java/org/apache/solr/search/function/OrdFieldSource.java +++ b/solr/core/src/java/org/apache/solr/search/function/OrdFieldSource.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search.function; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java b/solr/core/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java index a37748f4e0d..9375d969154 100644 --- a/solr/core/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java +++ b/solr/core/src/java/org/apache/solr/search/function/ReverseOrdFieldSource.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search.function; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/search/function/ValueSourceRangeFilter.java b/solr/core/src/java/org/apache/solr/search/function/ValueSourceRangeFilter.java index 0f44aa2d522..3a0502c478c 100644 --- a/solr/core/src/java/org/apache/solr/search/function/ValueSourceRangeFilter.java +++ b/solr/core/src/java/org/apache/solr/search/function/ValueSourceRangeFilter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search.function; import org.apache.lucene.index.LeafReaderContext; diff --git a/solr/core/src/java/org/apache/solr/search/function/distance/GeoDistValueSourceParser.java b/solr/core/src/java/org/apache/solr/search/function/distance/GeoDistValueSourceParser.java index 293639550a5..f7c05c3d30b 100644 --- a/solr/core/src/java/org/apache/solr/search/function/distance/GeoDistValueSourceParser.java +++ b/solr/core/src/java/org/apache/solr/search/function/distance/GeoDistValueSourceParser.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.function.distance; - /* * 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.search.function.distance; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.function.distance; import java.util.Arrays; import java.util.Collections; diff --git a/solr/core/src/java/org/apache/solr/search/function/distance/GeohashFunction.java b/solr/core/src/java/org/apache/solr/search/function/distance/GeohashFunction.java index ae9e091e081..c4a7bd55705 100644 --- a/solr/core/src/java/org/apache/solr/search/function/distance/GeohashFunction.java +++ b/solr/core/src/java/org/apache/solr/search/function/distance/GeohashFunction.java @@ -1,4 +1,3 @@ -package org.apache.solr.search.function.distance; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.search.function.distance; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.search.function.distance; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.queries.function.FunctionValues; import org.apache.lucene.queries.function.ValueSource; diff --git a/solr/core/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java b/solr/core/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java index ec6d3676072..4dd49e48121 100644 --- a/solr/core/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java +++ b/solr/core/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java @@ -1,4 +1,3 @@ -package org.apache.solr.search.function.distance; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,8 +14,7 @@ package org.apache.solr.search.function.distance; * See the License for the specific language governing permissions and * limitations under the License. */ - - +package org.apache.solr.search.function.distance; import com.spatial4j.core.context.SpatialContext; import com.spatial4j.core.distance.DistanceUtils; import com.spatial4j.core.distance.GeodesicSphereDistCalc; diff --git a/solr/core/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java b/solr/core/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java index 03f98f3879b..f9ac062dda3 100644 --- a/solr/core/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java +++ b/solr/core/src/java/org/apache/solr/search/function/distance/HaversineConstFunction.java @@ -1,4 +1,3 @@ -package org.apache.solr.search.function.distance; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.search.function.distance; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.search.function.distance; import com.spatial4j.core.distance.DistanceUtils; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.queries.function.FunctionValues; diff --git a/solr/core/src/java/org/apache/solr/search/function/distance/HaversineFunction.java b/solr/core/src/java/org/apache/solr/search/function/distance/HaversineFunction.java index b561f89e96c..c0eb0442ed2 100644 --- a/solr/core/src/java/org/apache/solr/search/function/distance/HaversineFunction.java +++ b/solr/core/src/java/org/apache/solr/search/function/distance/HaversineFunction.java @@ -1,4 +1,3 @@ -package org.apache.solr.search.function.distance; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.search.function.distance; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.search.function.distance; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.queries.function.FunctionValues; import org.apache.lucene.queries.function.ValueSource; diff --git a/solr/core/src/java/org/apache/solr/search/function/distance/SquaredEuclideanFunction.java b/solr/core/src/java/org/apache/solr/search/function/distance/SquaredEuclideanFunction.java index 8a5ea40e0fb..75c7fc05436 100644 --- a/solr/core/src/java/org/apache/solr/search/function/distance/SquaredEuclideanFunction.java +++ b/solr/core/src/java/org/apache/solr/search/function/distance/SquaredEuclideanFunction.java @@ -1,4 +1,3 @@ -package org.apache.solr.search.function.distance; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.search.function.distance; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.search.function.distance; import org.apache.lucene.queries.function.FunctionValues; import org.apache.lucene.queries.function.valuesource.MultiValueSource; diff --git a/solr/core/src/java/org/apache/solr/search/function/distance/StringDistanceFunction.java b/solr/core/src/java/org/apache/solr/search/function/distance/StringDistanceFunction.java index 5398d8fcb25..ed94e31a09d 100644 --- a/solr/core/src/java/org/apache/solr/search/function/distance/StringDistanceFunction.java +++ b/solr/core/src/java/org/apache/solr/search/function/distance/StringDistanceFunction.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.function.distance; - /* * 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.search.function.distance; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.function.distance; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.queries.function.FunctionValues; diff --git a/solr/core/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java b/solr/core/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java index 146203eb5f0..f98888235fe 100644 --- a/solr/core/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java +++ b/solr/core/src/java/org/apache/solr/search/function/distance/VectorDistanceFunction.java @@ -1,4 +1,3 @@ -package org.apache.solr.search.function.distance; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.search.function.distance; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.search.function.distance; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.queries.function.FunctionValues; import org.apache.lucene.queries.function.ValueSource; diff --git a/solr/core/src/java/org/apache/solr/search/function/distance/package-info.java b/solr/core/src/java/org/apache/solr/search/function/distance/package-info.java index 8f584cfdec5..1024bf80745 100644 --- a/solr/core/src/java/org/apache/solr/search/function/distance/package-info.java +++ b/solr/core/src/java/org/apache/solr/search/function/distance/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Solr implementations of {@link org.apache.lucene.queries.function.ValueSource} for distance based function queries. diff --git a/solr/core/src/java/org/apache/solr/search/function/package-info.java b/solr/core/src/java/org/apache/solr/search/function/package-info.java index 0d3c3e2b274..b3acb6cd35c 100644 --- a/solr/core/src/java/org/apache/solr/search/function/package-info.java +++ b/solr/core/src/java/org/apache/solr/search/function/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Solr implementations of {@link org.apache.lucene.queries.function.ValueSource} for function queries. diff --git a/solr/core/src/java/org/apache/solr/search/grouping/Command.java b/solr/core/src/java/org/apache/solr/search/grouping/Command.java index 9b361fa5301..1b3f1d17b2e 100644 --- a/solr/core/src/java/org/apache/solr/search/grouping/Command.java +++ b/solr/core/src/java/org/apache/solr/search/grouping/Command.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.grouping; - /* * 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.search.grouping; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.grouping; import org.apache.lucene.search.Collector; import org.apache.lucene.search.Sort; diff --git a/solr/core/src/java/org/apache/solr/search/grouping/CommandHandler.java b/solr/core/src/java/org/apache/solr/search/grouping/CommandHandler.java index 93a1784e97c..716f5dfef71 100644 --- a/solr/core/src/java/org/apache/solr/search/grouping/CommandHandler.java +++ b/solr/core/src/java/org/apache/solr/search/grouping/CommandHandler.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.grouping; - /* * 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.search.grouping; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.grouping; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/java/org/apache/solr/search/grouping/GroupingSpecification.java b/solr/core/src/java/org/apache/solr/search/grouping/GroupingSpecification.java index 21b6713c040..fbe0aced053 100644 --- a/solr/core/src/java/org/apache/solr/search/grouping/GroupingSpecification.java +++ b/solr/core/src/java/org/apache/solr/search/grouping/GroupingSpecification.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.grouping; - /* * 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.search.grouping; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.grouping; import org.apache.lucene.search.Sort; import org.apache.solr.search.Grouping; diff --git a/solr/core/src/java/org/apache/solr/search/grouping/collector/FilterCollector.java b/solr/core/src/java/org/apache/solr/search/grouping/collector/FilterCollector.java index 45cc8e95d19..bb139721ca5 100644 --- a/solr/core/src/java/org/apache/solr/search/grouping/collector/FilterCollector.java +++ b/solr/core/src/java/org/apache/solr/search/grouping/collector/FilterCollector.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.grouping.collector; - /* * 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.search.grouping.collector; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.grouping.collector; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/search/grouping/collector/package-info.java b/solr/core/src/java/org/apache/solr/search/grouping/collector/package-info.java index 782d5c61d48..1f5b71c1d38 100644 --- a/solr/core/src/java/org/apache/solr/search/grouping/collector/package-info.java +++ b/solr/core/src/java/org/apache/solr/search/grouping/collector/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Grouping related {@link org.apache.lucene.search.Collector}s */ diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/ShardRequestFactory.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/ShardRequestFactory.java index 88cdd8ee931..09bc3804ff1 100644 --- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/ShardRequestFactory.java +++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/ShardRequestFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.grouping.distributed; - /* * 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.search.grouping.distributed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.grouping.distributed; import org.apache.solr.handler.component.ResponseBuilder; import org.apache.solr.handler.component.ShardRequest; diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/ShardResponseProcessor.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/ShardResponseProcessor.java index 729685a7770..0e6bbfd950d 100644 --- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/ShardResponseProcessor.java +++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/ShardResponseProcessor.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.grouping.distributed; - /* * 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.search.grouping.distributed; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.grouping.distributed; import org.apache.solr.handler.component.ResponseBuilder; import org.apache.solr.handler.component.ShardRequest; diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/GroupConverter.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/GroupConverter.java index e500ab76db3..2a5827d6fa2 100644 --- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/GroupConverter.java +++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/GroupConverter.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.grouping.distributed.command; - /* * 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.search.grouping.distributed.command; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.grouping.distributed.command; import java.util.ArrayList; import java.util.Collection; diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/QueryCommand.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/QueryCommand.java index 5a94236d05a..a30ff8387ba 100644 --- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/QueryCommand.java +++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/QueryCommand.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.grouping.distributed.command; - /* * 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.search.grouping.distributed.command; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.grouping.distributed.command; import org.apache.lucene.search.*; import org.apache.solr.request.SolrQueryRequest; diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/QueryCommandResult.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/QueryCommandResult.java index 766dc3ab0af..8114a46c930 100644 --- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/QueryCommandResult.java +++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/QueryCommandResult.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.grouping.distributed.command; - /* * 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.search.grouping.distributed.command; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.grouping.distributed.command; import org.apache.lucene.search.TopDocs; diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/SearchGroupsFieldCommand.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/SearchGroupsFieldCommand.java index e29e8e046cb..55106ec49cc 100644 --- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/SearchGroupsFieldCommand.java +++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/SearchGroupsFieldCommand.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.grouping.distributed.command; - /* * 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.search.grouping.distributed.command; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.grouping.distributed.command; import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.search.Collector; diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/SearchGroupsFieldCommandResult.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/SearchGroupsFieldCommandResult.java index 59157fbcaf6..88603833828 100644 --- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/SearchGroupsFieldCommandResult.java +++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/SearchGroupsFieldCommandResult.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.grouping.distributed.command; - /* * 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.search.grouping.distributed.command; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.grouping.distributed.command; import java.util.Collection; diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/TopGroupsFieldCommand.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/TopGroupsFieldCommand.java index d65058c987e..2660b215431 100644 --- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/TopGroupsFieldCommand.java +++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/TopGroupsFieldCommand.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.grouping.distributed.command; - /* * 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.search.grouping.distributed.command; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.grouping.distributed.command; import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.search.Collector; diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/package-info.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/package-info.java index 4714bf41f41..7fb7261cac8 100644 --- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/package-info.java +++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Internal classes used to implement distributed result grouping */ diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/package-info.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/package-info.java index 53180fc2d63..f688a0a9580 100644 --- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/package-info.java +++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Internal classes used to implement distributed result grouping */ diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/SearchGroupsRequestFactory.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/SearchGroupsRequestFactory.java index d94ebf73957..0cc5ea716e0 100644 --- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/SearchGroupsRequestFactory.java +++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/SearchGroupsRequestFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.grouping.distributed.requestfactory; - /* * 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.search.grouping.distributed.requestfactory; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.grouping.distributed.requestfactory; import org.apache.solr.common.params.CommonParams; import org.apache.solr.common.params.GroupParams; diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/StoredFieldsShardRequestFactory.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/StoredFieldsShardRequestFactory.java index ba09068048f..497d0e1d6ad 100644 --- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/StoredFieldsShardRequestFactory.java +++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/StoredFieldsShardRequestFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.grouping.distributed.requestfactory; - /* * 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.search.grouping.distributed.requestfactory; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.grouping.distributed.requestfactory; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.grouping.GroupDocs; diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/TopGroupsShardRequestFactory.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/TopGroupsShardRequestFactory.java index 35f155f7220..bdca03f0574 100644 --- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/TopGroupsShardRequestFactory.java +++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/TopGroupsShardRequestFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.grouping.distributed.requestfactory; - /* * 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.search.grouping.distributed.requestfactory; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.grouping.distributed.requestfactory; import org.apache.lucene.analysis.reverse.ReverseStringFilter; import org.apache.lucene.search.grouping.SearchGroup; diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/package-info.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/package-info.java index 737223007cb..fd4d4ebb274 100644 --- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/package-info.java +++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Internal classes used to implement distributed result grouping */ diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/SearchGroupShardResponseProcessor.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/SearchGroupShardResponseProcessor.java index 07e854c3ebc..18b0de54a44 100644 --- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/SearchGroupShardResponseProcessor.java +++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/SearchGroupShardResponseProcessor.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.grouping.distributed.responseprocessor; - /* * 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.search.grouping.distributed.responseprocessor; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.grouping.distributed.responseprocessor; import org.apache.lucene.search.Sort; import org.apache.lucene.search.grouping.SearchGroup; diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/StoredFieldsShardResponseProcessor.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/StoredFieldsShardResponseProcessor.java index 6b5c03621ee..dcb3c617ee9 100644 --- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/StoredFieldsShardResponseProcessor.java +++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/StoredFieldsShardResponseProcessor.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.grouping.distributed.responseprocessor; - /* * 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.search.grouping.distributed.responseprocessor; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.grouping.distributed.responseprocessor; import org.apache.lucene.search.FieldDoc; import org.apache.solr.common.SolrDocument; diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java index 721840d9f68..fa8de2428e7 100644 --- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java +++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.grouping.distributed.responseprocessor; - /* * 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.search.grouping.distributed.responseprocessor; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.grouping.distributed.responseprocessor; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.Sort; diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/package-info.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/package-info.java index 8f662ad12df..0aa38a3ce0b 100644 --- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/package-info.java +++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Internal classes used to implement distributed result grouping */ diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/SearchGroupsResultTransformer.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/SearchGroupsResultTransformer.java index e13abf929b3..2dba2a3cd7d 100644 --- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/SearchGroupsResultTransformer.java +++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/SearchGroupsResultTransformer.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.grouping.distributed.shardresultserializer; - /* * 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.search.grouping.distributed.shardresultserializer; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.grouping.distributed.shardresultserializer; import org.apache.lucene.search.Sort; import org.apache.lucene.search.grouping.SearchGroup; diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/ShardResultTransformer.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/ShardResultTransformer.java index 79998b3df62..04a3dfc263d 100644 --- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/ShardResultTransformer.java +++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/ShardResultTransformer.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.grouping.distributed.shardresultserializer; - /* * 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.search.grouping.distributed.shardresultserializer; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.grouping.distributed.shardresultserializer; import org.apache.lucene.search.Sort; import org.apache.solr.common.util.NamedList; diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java index 892c7a15c7d..f65bcf24ca7 100644 --- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java +++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.grouping.distributed.shardresultserializer; - /* * 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.search.grouping.distributed.shardresultserializer; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.grouping.distributed.shardresultserializer; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/package-info.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/package-info.java index 965bd6e02fc..92a7786b01c 100644 --- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/package-info.java +++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Internal classes used to implement distributed result grouping */ diff --git a/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/EndResultTransformer.java b/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/EndResultTransformer.java index d559f56f8cc..40cd8d40eac 100644 --- a/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/EndResultTransformer.java +++ b/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/EndResultTransformer.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.grouping.endresulttransformer; - /* * 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.search.grouping.endresulttransformer; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.grouping.endresulttransformer; import org.apache.lucene.search.ScoreDoc; import org.apache.solr.common.SolrDocument; diff --git a/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/GroupedEndResultTransformer.java b/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/GroupedEndResultTransformer.java index a1707d0a6c5..f8c9872a7a6 100644 --- a/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/GroupedEndResultTransformer.java +++ b/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/GroupedEndResultTransformer.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.grouping.endresulttransformer; - /* * 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.search.grouping.endresulttransformer; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.grouping.endresulttransformer; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.grouping.GroupDocs; diff --git a/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/MainEndResultTransformer.java b/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/MainEndResultTransformer.java index d8afd38874f..630aa63fcd7 100644 --- a/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/MainEndResultTransformer.java +++ b/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/MainEndResultTransformer.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.grouping.endresulttransformer; - /* * 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.search.grouping.endresulttransformer; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.grouping.endresulttransformer; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.grouping.GroupDocs; diff --git a/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/SimpleEndResultTransformer.java b/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/SimpleEndResultTransformer.java index 5667181d6c9..8d11674838b 100644 --- a/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/SimpleEndResultTransformer.java +++ b/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/SimpleEndResultTransformer.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.grouping.endresulttransformer; - /* * 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.search.grouping.endresulttransformer; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.grouping.endresulttransformer; import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.grouping.GroupDocs; diff --git a/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/package-info.java b/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/package-info.java index 4cde5a2252a..df9894792ea 100644 --- a/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/package-info.java +++ b/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * APIs and classes for transforming result grouping results into the appropriate response format diff --git a/solr/core/src/java/org/apache/solr/search/grouping/package-info.java b/solr/core/src/java/org/apache/solr/search/grouping/package-info.java index ee0555ff8ec..10bab490694 100644 --- a/solr/core/src/java/org/apache/solr/search/grouping/package-info.java +++ b/solr/core/src/java/org/apache/solr/search/grouping/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * APIs and classes for implementing result grouping *

    diff --git a/solr/core/src/java/org/apache/solr/search/join/BitSetSlice.java b/solr/core/src/java/org/apache/solr/search/join/BitSetSlice.java index 5e45c15af5a..824c4e25dcf 100644 --- a/solr/core/src/java/org/apache/solr/search/join/BitSetSlice.java +++ b/solr/core/src/java/org/apache/solr/search/join/BitSetSlice.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search.join; import org.apache.lucene.util.FixedBitSet; diff --git a/solr/core/src/java/org/apache/solr/search/join/BlockJoinChildQParser.java b/solr/core/src/java/org/apache/solr/search/join/BlockJoinChildQParser.java index 696b6ab7ac6..faf4c5be960 100644 --- a/solr/core/src/java/org/apache/solr/search/join/BlockJoinChildQParser.java +++ b/solr/core/src/java/org/apache/solr/search/join/BlockJoinChildQParser.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search.join; import org.apache.lucene.search.Query; diff --git a/solr/core/src/java/org/apache/solr/search/join/BlockJoinChildQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/join/BlockJoinChildQParserPlugin.java index 3edcaabe02b..a792880fb5d 100644 --- a/solr/core/src/java/org/apache/solr/search/join/BlockJoinChildQParserPlugin.java +++ b/solr/core/src/java/org/apache/solr/search/join/BlockJoinChildQParserPlugin.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search.join; import org.apache.solr.common.params.SolrParams; diff --git a/solr/core/src/java/org/apache/solr/search/join/BlockJoinDocSetFacetComponent.java b/solr/core/src/java/org/apache/solr/search/join/BlockJoinDocSetFacetComponent.java index dfb62b8c33b..ae334850f69 100644 --- a/solr/core/src/java/org/apache/solr/search/join/BlockJoinDocSetFacetComponent.java +++ b/solr/core/src/java/org/apache/solr/search/join/BlockJoinDocSetFacetComponent.java @@ -1,3 +1,19 @@ +/* + * 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.search.join; import java.io.IOException; @@ -23,23 +39,6 @@ import org.apache.solr.search.QueryContext; import org.apache.solr.search.facet.BlockJoin; import org.apache.solr.search.join.BlockJoinFieldFacetAccumulator.AggregatableDocIter; -/* - * 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. - */ - /** * It does the same as BlockJoinFacetComponent, but operates on docsets, * it should be faster for static mostly indexes. This component doesn't impact diff --git a/solr/core/src/java/org/apache/solr/search/join/BlockJoinFacetCollector.java b/solr/core/src/java/org/apache/solr/search/join/BlockJoinFacetCollector.java index 4ed2b83d46a..da84d9f7892 100644 --- a/solr/core/src/java/org/apache/solr/search/join/BlockJoinFacetCollector.java +++ b/solr/core/src/java/org/apache/solr/search/join/BlockJoinFacetCollector.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.join; - /* * 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.search.join; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.join; import java.io.IOException; import java.util.LinkedList; diff --git a/solr/core/src/java/org/apache/solr/search/join/BlockJoinFacetComponent.java b/solr/core/src/java/org/apache/solr/search/join/BlockJoinFacetComponent.java index 70d08e75951..03a33d13e40 100644 --- a/solr/core/src/java/org/apache/solr/search/join/BlockJoinFacetComponent.java +++ b/solr/core/src/java/org/apache/solr/search/join/BlockJoinFacetComponent.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.join; - /* * 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.search.join; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.join; import java.io.IOException; import java.util.LinkedList; diff --git a/solr/core/src/java/org/apache/solr/search/join/BlockJoinFacetFilter.java b/solr/core/src/java/org/apache/solr/search/join/BlockJoinFacetFilter.java index a286c96385c..1976431d364 100644 --- a/solr/core/src/java/org/apache/solr/search/join/BlockJoinFacetFilter.java +++ b/solr/core/src/java/org/apache/solr/search/join/BlockJoinFacetFilter.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.join; - /* * 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.search.join; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.join; import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; diff --git a/solr/core/src/java/org/apache/solr/search/join/BlockJoinFieldFacetAccumulator.java b/solr/core/src/java/org/apache/solr/search/join/BlockJoinFieldFacetAccumulator.java index 02712dbfee7..286cd45b308 100644 --- a/solr/core/src/java/org/apache/solr/search/join/BlockJoinFieldFacetAccumulator.java +++ b/solr/core/src/java/org/apache/solr/search/join/BlockJoinFieldFacetAccumulator.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.join; - /* * 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.search.join; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.join; import java.io.IOException; import java.util.Arrays; diff --git a/solr/core/src/java/org/apache/solr/search/join/BlockJoinParentQParser.java b/solr/core/src/java/org/apache/solr/search/join/BlockJoinParentQParser.java index c78463749dd..2203220a201 100644 --- a/solr/core/src/java/org/apache/solr/search/join/BlockJoinParentQParser.java +++ b/solr/core/src/java/org/apache/solr/search/join/BlockJoinParentQParser.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search.join; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/search/join/BlockJoinParentQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/join/BlockJoinParentQParserPlugin.java index 70611911e66..b40233fbc84 100644 --- a/solr/core/src/java/org/apache/solr/search/join/BlockJoinParentQParserPlugin.java +++ b/solr/core/src/java/org/apache/solr/search/join/BlockJoinParentQParserPlugin.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search.join; import org.apache.lucene.search.join.ScoreMode; diff --git a/solr/core/src/java/org/apache/solr/search/join/FrontierQuery.java b/solr/core/src/java/org/apache/solr/search/join/FrontierQuery.java index 542c95e4b24..2507a108e7e 100644 --- a/solr/core/src/java/org/apache/solr/search/join/FrontierQuery.java +++ b/solr/core/src/java/org/apache/solr/search/join/FrontierQuery.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.join; - /* * 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.search.join; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.join; import org.apache.lucene.search.Query; /** diff --git a/solr/core/src/java/org/apache/solr/search/join/GraphQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/join/GraphQParserPlugin.java index c60e54aeaa1..5a0e0b00b8c 100644 --- a/solr/core/src/java/org/apache/solr/search/join/GraphQParserPlugin.java +++ b/solr/core/src/java/org/apache/solr/search/join/GraphQParserPlugin.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.join; - /* * 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.search.join; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.join; import org.apache.solr.common.params.SolrParams; import org.apache.solr.common.util.NamedList; diff --git a/solr/core/src/java/org/apache/solr/search/join/GraphQuery.java b/solr/core/src/java/org/apache/solr/search/join/GraphQuery.java index a31568a096d..188971762c6 100644 --- a/solr/core/src/java/org/apache/solr/search/join/GraphQuery.java +++ b/solr/core/src/java/org/apache/solr/search/join/GraphQuery.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.join; - /* * 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.search.join; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.join; import java.io.IOException; import java.util.ArrayList; diff --git a/solr/core/src/java/org/apache/solr/search/join/GraphQueryParser.java b/solr/core/src/java/org/apache/solr/search/join/GraphQueryParser.java index 02c653fae10..b6aae507047 100644 --- a/solr/core/src/java/org/apache/solr/search/join/GraphQueryParser.java +++ b/solr/core/src/java/org/apache/solr/search/join/GraphQueryParser.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.join; - /* * 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.search.join; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.join; import org.apache.lucene.search.Query; import org.apache.solr.common.params.CommonParams; diff --git a/solr/core/src/java/org/apache/solr/search/join/GraphTermsCollector.java b/solr/core/src/java/org/apache/solr/search/join/GraphTermsCollector.java index 389721e066b..33a03f40e25 100644 --- a/solr/core/src/java/org/apache/solr/search/join/GraphTermsCollector.java +++ b/solr/core/src/java/org/apache/solr/search/join/GraphTermsCollector.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.join; - /* * 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.search.join; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.join; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/search/join/ScoreJoinQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/join/ScoreJoinQParserPlugin.java index e27e22794cd..be128c6aca0 100644 --- a/solr/core/src/java/org/apache/solr/search/join/ScoreJoinQParserPlugin.java +++ b/solr/core/src/java/org/apache/solr/search/join/ScoreJoinQParserPlugin.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search.join; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/search/join/ScoreModeParser.java b/solr/core/src/java/org/apache/solr/search/join/ScoreModeParser.java index ab778376208..971f23f7536 100644 --- a/solr/core/src/java/org/apache/solr/search/join/ScoreModeParser.java +++ b/solr/core/src/java/org/apache/solr/search/join/ScoreModeParser.java @@ -1,13 +1,3 @@ -package org.apache.solr.search.join; - -import java.util.Collections; -import java.util.HashMap; -import java.util.Locale; -import java.util.Map; - -import org.apache.lucene.search.join.ScoreMode; -import org.apache.solr.search.SyntaxError; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -24,6 +14,15 @@ import org.apache.solr.search.SyntaxError; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.join; + +import java.util.Collections; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; + +import org.apache.lucene.search.join.ScoreMode; +import org.apache.solr.search.SyntaxError; class ScoreModeParser { final private static Map lowerAndCapitalCase = diff --git a/solr/core/src/java/org/apache/solr/search/join/package-info.java b/solr/core/src/java/org/apache/solr/search/join/package-info.java index 972856f8a10..dac62790e24 100644 --- a/solr/core/src/java/org/apache/solr/search/join/package-info.java +++ b/solr/core/src/java/org/apache/solr/search/join/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Classes related to joins. */ diff --git a/solr/core/src/java/org/apache/solr/search/mlt/CloudMLTQParser.java b/solr/core/src/java/org/apache/solr/search/mlt/CloudMLTQParser.java index db75517bf89..114226fe302 100644 --- a/solr/core/src/java/org/apache/solr/search/mlt/CloudMLTQParser.java +++ b/solr/core/src/java/org/apache/solr/search/mlt/CloudMLTQParser.java @@ -1,4 +1,3 @@ -package org.apache.solr.search.mlt; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.search.mlt; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.search.mlt; import org.apache.lucene.index.Term; import org.apache.lucene.queries.mlt.MoreLikeThis; import org.apache.lucene.search.BooleanClause; diff --git a/solr/core/src/java/org/apache/solr/search/mlt/MLTQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/mlt/MLTQParserPlugin.java index c18e546298f..708ae61965c 100644 --- a/solr/core/src/java/org/apache/solr/search/mlt/MLTQParserPlugin.java +++ b/solr/core/src/java/org/apache/solr/search/mlt/MLTQParserPlugin.java @@ -1,4 +1,3 @@ -package org.apache.solr.search.mlt; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.search.mlt; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.search.mlt; import org.apache.solr.common.params.SolrParams; import org.apache.solr.common.util.NamedList; import org.apache.solr.request.SolrQueryRequest; diff --git a/solr/core/src/java/org/apache/solr/search/mlt/SimpleMLTQParser.java b/solr/core/src/java/org/apache/solr/search/mlt/SimpleMLTQParser.java index 19e78a2db64..bdcaafbf670 100644 --- a/solr/core/src/java/org/apache/solr/search/mlt/SimpleMLTQParser.java +++ b/solr/core/src/java/org/apache/solr/search/mlt/SimpleMLTQParser.java @@ -1,4 +1,3 @@ -package org.apache.solr.search.mlt; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.search.mlt; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.search.mlt; import org.apache.lucene.index.Term; import org.apache.lucene.queries.mlt.MoreLikeThis; import org.apache.lucene.search.BooleanClause; diff --git a/solr/core/src/java/org/apache/solr/search/mlt/package-info.java b/solr/core/src/java/org/apache/solr/search/mlt/package-info.java index 22ea63936f5..e50afe19c8b 100644 --- a/solr/core/src/java/org/apache/solr/search/mlt/package-info.java +++ b/solr/core/src/java/org/apache/solr/search/mlt/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * APIs and classes for implementing MoreLikeThis (mlt) QueryParser. */ diff --git a/solr/core/src/java/org/apache/solr/search/package-info.java b/solr/core/src/java/org/apache/solr/search/package-info.java index 67940b6a179..b49cd6c8680 100644 --- a/solr/core/src/java/org/apache/solr/search/package-info.java +++ b/solr/core/src/java/org/apache/solr/search/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * APIs and classes for {@linkplain org.apache.solr.search.QParserPlugin parsing} and {@linkplain org.apache.solr.search.SolrIndexSearcher processing} search requests */ diff --git a/solr/core/src/java/org/apache/solr/search/similarities/BM25SimilarityFactory.java b/solr/core/src/java/org/apache/solr/search/similarities/BM25SimilarityFactory.java index b09c7c9929b..ef8ffbd2654 100644 --- a/solr/core/src/java/org/apache/solr/search/similarities/BM25SimilarityFactory.java +++ b/solr/core/src/java/org/apache/solr/search/similarities/BM25SimilarityFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.similarities; - /* * 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.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.similarities; import org.apache.lucene.search.similarities.BM25Similarity; import org.apache.lucene.search.similarities.Similarity; diff --git a/solr/core/src/java/org/apache/solr/search/similarities/ClassicSimilarityFactory.java b/solr/core/src/java/org/apache/solr/search/similarities/ClassicSimilarityFactory.java index a8cf6abea43..6f862b28b2b 100644 --- a/solr/core/src/java/org/apache/solr/search/similarities/ClassicSimilarityFactory.java +++ b/solr/core/src/java/org/apache/solr/search/similarities/ClassicSimilarityFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.similarities; - /* * 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.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.similarities; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.search.similarities.Similarity; diff --git a/solr/core/src/java/org/apache/solr/search/similarities/DFISimilarityFactory.java b/solr/core/src/java/org/apache/solr/search/similarities/DFISimilarityFactory.java index ca1386dd0f5..0222ff3d8e3 100644 --- a/solr/core/src/java/org/apache/solr/search/similarities/DFISimilarityFactory.java +++ b/solr/core/src/java/org/apache/solr/search/similarities/DFISimilarityFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.similarities; - /* * 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.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.similarities; import org.apache.lucene.search.similarities.DFISimilarity; import org.apache.lucene.search.similarities.Independence; diff --git a/solr/core/src/java/org/apache/solr/search/similarities/DFRSimilarityFactory.java b/solr/core/src/java/org/apache/solr/search/similarities/DFRSimilarityFactory.java index ceb6cb3b4d5..18fde0dfc88 100644 --- a/solr/core/src/java/org/apache/solr/search/similarities/DFRSimilarityFactory.java +++ b/solr/core/src/java/org/apache/solr/search/similarities/DFRSimilarityFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.similarities; - /* * 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.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.similarities; import org.apache.lucene.search.similarities.AfterEffect; import org.apache.lucene.search.similarities.AfterEffect.NoAfterEffect; // javadoc diff --git a/solr/core/src/java/org/apache/solr/search/similarities/IBSimilarityFactory.java b/solr/core/src/java/org/apache/solr/search/similarities/IBSimilarityFactory.java index 0ad95077617..2d938e27ef7 100644 --- a/solr/core/src/java/org/apache/solr/search/similarities/IBSimilarityFactory.java +++ b/solr/core/src/java/org/apache/solr/search/similarities/IBSimilarityFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.similarities; - /* * 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.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.similarities; import org.apache.lucene.search.similarities.Distribution; import org.apache.lucene.search.similarities.DistributionLL; diff --git a/solr/core/src/java/org/apache/solr/search/similarities/LMDirichletSimilarityFactory.java b/solr/core/src/java/org/apache/solr/search/similarities/LMDirichletSimilarityFactory.java index b294416ca6d..37a1b64aea8 100644 --- a/solr/core/src/java/org/apache/solr/search/similarities/LMDirichletSimilarityFactory.java +++ b/solr/core/src/java/org/apache/solr/search/similarities/LMDirichletSimilarityFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.similarities; - /* * 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.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.similarities; import org.apache.lucene.search.similarities.LMDirichletSimilarity; import org.apache.lucene.search.similarities.Similarity; diff --git a/solr/core/src/java/org/apache/solr/search/similarities/LMJelinekMercerSimilarityFactory.java b/solr/core/src/java/org/apache/solr/search/similarities/LMJelinekMercerSimilarityFactory.java index d3bff7b5ec0..334e9a047e5 100644 --- a/solr/core/src/java/org/apache/solr/search/similarities/LMJelinekMercerSimilarityFactory.java +++ b/solr/core/src/java/org/apache/solr/search/similarities/LMJelinekMercerSimilarityFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.similarities; - /* * 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.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.similarities; import org.apache.lucene.search.similarities.LMJelinekMercerSimilarity; import org.apache.lucene.search.similarities.Similarity; diff --git a/solr/core/src/java/org/apache/solr/search/similarities/SchemaSimilarityFactory.java b/solr/core/src/java/org/apache/solr/search/similarities/SchemaSimilarityFactory.java index c37a81e1bc1..eeb5e782dfd 100644 --- a/solr/core/src/java/org/apache/solr/search/similarities/SchemaSimilarityFactory.java +++ b/solr/core/src/java/org/apache/solr/search/similarities/SchemaSimilarityFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.similarities; - /* * 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.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.similarities; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.search.similarities.BM25Similarity; diff --git a/solr/core/src/java/org/apache/solr/search/similarities/SweetSpotSimilarityFactory.java b/solr/core/src/java/org/apache/solr/search/similarities/SweetSpotSimilarityFactory.java index ac4976d4483..6452d919834 100644 --- a/solr/core/src/java/org/apache/solr/search/similarities/SweetSpotSimilarityFactory.java +++ b/solr/core/src/java/org/apache/solr/search/similarities/SweetSpotSimilarityFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.similarities; - /* * 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.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.similarities; import org.apache.lucene.misc.SweetSpotSimilarity; import org.apache.lucene.search.similarities.ClassicSimilarity; // jdoc diff --git a/solr/core/src/java/org/apache/solr/search/similarities/package-info.java b/solr/core/src/java/org/apache/solr/search/similarities/package-info.java index 560a7d95cc4..d6b02e5d7ec 100644 --- a/solr/core/src/java/org/apache/solr/search/similarities/package-info.java +++ b/solr/core/src/java/org/apache/solr/search/similarities/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Factories for various built-in Lucene ranking models. *

    diff --git a/solr/core/src/java/org/apache/solr/search/stats/CachedSearcherStats.java b/solr/core/src/java/org/apache/solr/search/stats/CachedSearcherStats.java index 84898b09cec..cfa71d14f66 100644 --- a/solr/core/src/java/org/apache/solr/search/stats/CachedSearcherStats.java +++ b/solr/core/src/java/org/apache/solr/search/stats/CachedSearcherStats.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.stats; - /* * 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.search.stats; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.stats; public abstract class CachedSearcherStats { diff --git a/solr/core/src/java/org/apache/solr/search/stats/CollectionStats.java b/solr/core/src/java/org/apache/solr/search/stats/CollectionStats.java index 9607b3f8c61..d151a0f0e6e 100644 --- a/solr/core/src/java/org/apache/solr/search/stats/CollectionStats.java +++ b/solr/core/src/java/org/apache/solr/search/stats/CollectionStats.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.stats; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,7 +14,8 @@ package org.apache.solr.search.stats; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.search.stats; + import org.apache.lucene.search.CollectionStatistics; /** diff --git a/solr/core/src/java/org/apache/solr/search/stats/ExactSharedStatsCache.java b/solr/core/src/java/org/apache/solr/search/stats/ExactSharedStatsCache.java index d51bf0967a7..fb959a47fc0 100644 --- a/solr/core/src/java/org/apache/solr/search/stats/ExactSharedStatsCache.java +++ b/solr/core/src/java/org/apache/solr/search/stats/ExactSharedStatsCache.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.stats; - /* * 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.search.stats; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.stats; import org.apache.solr.core.PluginInfo; import org.apache.solr.handler.component.ResponseBuilder; diff --git a/solr/core/src/java/org/apache/solr/search/stats/ExactStatsCache.java b/solr/core/src/java/org/apache/solr/search/stats/ExactStatsCache.java index 0e55b940dec..51d772c3fbe 100644 --- a/solr/core/src/java/org/apache/solr/search/stats/ExactStatsCache.java +++ b/solr/core/src/java/org/apache/solr/search/stats/ExactStatsCache.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.stats; - /* * 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.search.stats; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.stats; import com.google.common.collect.Lists; import org.apache.lucene.index.IndexReaderContext; diff --git a/solr/core/src/java/org/apache/solr/search/stats/LRUStatsCache.java b/solr/core/src/java/org/apache/solr/search/stats/LRUStatsCache.java index 45e49b0c9af..2c7abbd9cd4 100644 --- a/solr/core/src/java/org/apache/solr/search/stats/LRUStatsCache.java +++ b/solr/core/src/java/org/apache/solr/search/stats/LRUStatsCache.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.stats; - /* * 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.search.stats; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.stats; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/java/org/apache/solr/search/stats/LocalStatsCache.java b/solr/core/src/java/org/apache/solr/search/stats/LocalStatsCache.java index 8e908edac45..2eb3fc0e35a 100644 --- a/solr/core/src/java/org/apache/solr/search/stats/LocalStatsCache.java +++ b/solr/core/src/java/org/apache/solr/search/stats/LocalStatsCache.java @@ -1,7 +1,3 @@ -package org.apache.solr.search.stats; - -import java.lang.invoke.MethodHandles; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import java.lang.invoke.MethodHandles; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.stats; + +import java.lang.invoke.MethodHandles; import java.util.List; diff --git a/solr/core/src/java/org/apache/solr/search/stats/LocalStatsSource.java b/solr/core/src/java/org/apache/solr/search/stats/LocalStatsSource.java index ff2806cca4a..989f3ad0353 100644 --- a/solr/core/src/java/org/apache/solr/search/stats/LocalStatsSource.java +++ b/solr/core/src/java/org/apache/solr/search/stats/LocalStatsSource.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.stats; - /* * 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.search.stats; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.stats; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/search/stats/StatsCache.java b/solr/core/src/java/org/apache/solr/search/stats/StatsCache.java index aba2fe2443c..ab5790e15ed 100644 --- a/solr/core/src/java/org/apache/solr/search/stats/StatsCache.java +++ b/solr/core/src/java/org/apache/solr/search/stats/StatsCache.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.stats; - /* * 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.search.stats; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.stats; import java.util.List; diff --git a/solr/core/src/java/org/apache/solr/search/stats/StatsSource.java b/solr/core/src/java/org/apache/solr/search/stats/StatsSource.java index 0de098abe14..4daaa48c2e4 100644 --- a/solr/core/src/java/org/apache/solr/search/stats/StatsSource.java +++ b/solr/core/src/java/org/apache/solr/search/stats/StatsSource.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.stats; - /* * 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.search.stats; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.stats; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/search/stats/StatsUtil.java b/solr/core/src/java/org/apache/solr/search/stats/StatsUtil.java index 08c6a507d3f..3e82e270d95 100644 --- a/solr/core/src/java/org/apache/solr/search/stats/StatsUtil.java +++ b/solr/core/src/java/org/apache/solr/search/stats/StatsUtil.java @@ -1,7 +1,3 @@ -package org.apache.solr.search.stats; - -import java.lang.invoke.MethodHandles; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import java.lang.invoke.MethodHandles; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.stats; + +import java.lang.invoke.MethodHandles; import java.util.HashMap; import java.util.Map; diff --git a/solr/core/src/java/org/apache/solr/search/stats/TermStats.java b/solr/core/src/java/org/apache/solr/search/stats/TermStats.java index 0c8f11da3f8..8f45a9b21e5 100644 --- a/solr/core/src/java/org/apache/solr/search/stats/TermStats.java +++ b/solr/core/src/java/org/apache/solr/search/stats/TermStats.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.stats; - /* * 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.search.stats; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.stats; import org.apache.lucene.index.Term; import org.apache.lucene.search.TermStatistics; diff --git a/solr/core/src/java/org/apache/solr/search/stats/package-info.java b/solr/core/src/java/org/apache/solr/search/stats/package-info.java index 8b3df6c1469..287c05fd2df 100644 --- a/solr/core/src/java/org/apache/solr/search/stats/package-info.java +++ b/solr/core/src/java/org/apache/solr/search/stats/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * APIs and Classes implementing the Stats component used for document frequency * calculations. diff --git a/solr/core/src/java/org/apache/solr/security/AuthenticationPlugin.java b/solr/core/src/java/org/apache/solr/security/AuthenticationPlugin.java index 0df93f2210a..52296337fef 100644 --- a/solr/core/src/java/org/apache/solr/security/AuthenticationPlugin.java +++ b/solr/core/src/java/org/apache/solr/security/AuthenticationPlugin.java @@ -1,3 +1,19 @@ +/* + * 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 javax.servlet.FilterChain; @@ -16,23 +32,6 @@ import java.util.Map; import org.apache.http.auth.BasicUserPrincipal; import org.apache.solr.client.solrj.impl.HttpClientConfigurer; -/* - * 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. - */ - /** * * @lucene.experimental diff --git a/solr/core/src/java/org/apache/solr/security/AuthorizationContext.java b/solr/core/src/java/org/apache/solr/security/AuthorizationContext.java index f5e2d1ffeef..7e65a63b09c 100644 --- a/solr/core/src/java/org/apache/solr/security/AuthorizationContext.java +++ b/solr/core/src/java/org/apache/solr/security/AuthorizationContext.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 @@ -16,6 +14,7 @@ package org.apache.solr.security; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.security; import java.security.Principal; import java.util.Enumeration; diff --git a/solr/core/src/java/org/apache/solr/security/AuthorizationPlugin.java b/solr/core/src/java/org/apache/solr/security/AuthorizationPlugin.java index cc45d120c7c..70354c99fc0 100644 --- a/solr/core/src/java/org/apache/solr/security/AuthorizationPlugin.java +++ b/solr/core/src/java/org/apache/solr/security/AuthorizationPlugin.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 @@ -16,6 +14,7 @@ package org.apache.solr.security; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.security; import java.io.Closeable; import java.util.Map; diff --git a/solr/core/src/java/org/apache/solr/security/AuthorizationResponse.java b/solr/core/src/java/org/apache/solr/security/AuthorizationResponse.java index 95d23815e47..6c84489863b 100644 --- a/solr/core/src/java/org/apache/solr/security/AuthorizationResponse.java +++ b/solr/core/src/java/org/apache/solr/security/AuthorizationResponse.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 @@ -16,6 +14,7 @@ package org.apache.solr.security; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.security; /* This class currently only stores an int statusCode (HttpStatus) value and a message but can be used to return ACLs and other information from the authorization plugin. diff --git a/solr/core/src/java/org/apache/solr/security/BasicAuthPlugin.java b/solr/core/src/java/org/apache/solr/security/BasicAuthPlugin.java index dac5b8d8d83..03c75c631a2 100644 --- a/solr/core/src/java/org/apache/solr/security/BasicAuthPlugin.java +++ b/solr/core/src/java/org/apache/solr/security/BasicAuthPlugin.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 @@ -16,7 +14,7 @@ package org.apache.solr.security; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.security; import javax.servlet.FilterChain; import javax.servlet.ServletRequest; diff --git a/solr/core/src/java/org/apache/solr/security/ConfigEditablePlugin.java b/solr/core/src/java/org/apache/solr/security/ConfigEditablePlugin.java index 22b141b275c..a8bef9cb0a2 100644 --- a/solr/core/src/java/org/apache/solr/security/ConfigEditablePlugin.java +++ b/solr/core/src/java/org/apache/solr/security/ConfigEditablePlugin.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 @@ -16,6 +14,7 @@ package org.apache.solr.security; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.security; import java.util.List; import java.util.Map; diff --git a/solr/core/src/java/org/apache/solr/security/HttpClientInterceptorPlugin.java b/solr/core/src/java/org/apache/solr/security/HttpClientInterceptorPlugin.java index ea208215dcc..d7598df6156 100644 --- a/solr/core/src/java/org/apache/solr/security/HttpClientInterceptorPlugin.java +++ b/solr/core/src/java/org/apache/solr/security/HttpClientInterceptorPlugin.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 @@ -16,7 +14,7 @@ package org.apache.solr.security; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.security; import org.apache.solr.client.solrj.impl.HttpClientConfigurer; diff --git a/solr/core/src/java/org/apache/solr/security/KerberosFilter.java b/solr/core/src/java/org/apache/solr/security/KerberosFilter.java index cc6cd18841b..ee234882491 100644 --- a/solr/core/src/java/org/apache/solr/security/KerberosFilter.java +++ b/solr/core/src/java/org/apache/solr/security/KerberosFilter.java @@ -1,16 +1,3 @@ -package org.apache.solr.security; - -import java.io.IOException; - -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.apache.hadoop.security.authentication.server.AuthenticationFilter; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -27,6 +14,18 @@ import org.apache.hadoop.security.authentication.server.AuthenticationFilter; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.security; + +import java.io.IOException; + +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import org.apache.hadoop.security.authentication.server.AuthenticationFilter; public class KerberosFilter extends AuthenticationFilter { diff --git a/solr/core/src/java/org/apache/solr/security/KerberosPlugin.java b/solr/core/src/java/org/apache/solr/security/KerberosPlugin.java index ca18b56bd6b..ad7f29bffe0 100644 --- a/solr/core/src/java/org/apache/solr/security/KerberosPlugin.java +++ b/solr/core/src/java/org/apache/solr/security/KerberosPlugin.java @@ -1,3 +1,19 @@ +/* + * 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.io.InputStream; @@ -36,23 +52,6 @@ import org.apache.solr.core.CoreContainer; 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 KerberosPlugin extends AuthenticationPlugin implements HttpClientInterceptorPlugin { private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); diff --git a/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java b/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java index c811d6a7d23..3c65af29647 100644 --- a/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java +++ b/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.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 @@ -16,6 +14,7 @@ package org.apache.solr.security; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.security; import javax.servlet.FilterChain; import javax.servlet.ServletRequest; diff --git a/solr/core/src/java/org/apache/solr/security/RuleBasedAuthorizationPlugin.java b/solr/core/src/java/org/apache/solr/security/RuleBasedAuthorizationPlugin.java index a4ee535878b..fa13e7c6f3c 100644 --- a/solr/core/src/java/org/apache/solr/security/RuleBasedAuthorizationPlugin.java +++ b/solr/core/src/java/org/apache/solr/security/RuleBasedAuthorizationPlugin.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 @@ -16,6 +14,7 @@ package org.apache.solr.security; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.security; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/java/org/apache/solr/security/SecurityPluginHolder.java b/solr/core/src/java/org/apache/solr/security/SecurityPluginHolder.java index b37ce03fce7..81be246faad 100644 --- a/solr/core/src/java/org/apache/solr/security/SecurityPluginHolder.java +++ b/solr/core/src/java/org/apache/solr/security/SecurityPluginHolder.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 @@ -16,7 +14,7 @@ package org.apache.solr.security; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.security; public class SecurityPluginHolder { private final int znodeVersion; diff --git a/solr/core/src/java/org/apache/solr/security/Sha256AuthenticationProvider.java b/solr/core/src/java/org/apache/solr/security/Sha256AuthenticationProvider.java index b8558ffc390..545792fe7e1 100644 --- a/solr/core/src/java/org/apache/solr/security/Sha256AuthenticationProvider.java +++ b/solr/core/src/java/org/apache/solr/security/Sha256AuthenticationProvider.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 @@ -16,6 +14,7 @@ package org.apache.solr.security; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.security; import java.lang.invoke.MethodHandles; import java.nio.charset.StandardCharsets; diff --git a/solr/core/src/java/org/apache/solr/security/package-info.java b/solr/core/src/java/org/apache/solr/security/package-info.java index 8a6fead5f65..3db6e739faf 100644 --- a/solr/core/src/java/org/apache/solr/security/package-info.java +++ b/solr/core/src/java/org/apache/solr/security/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Commonly used classes for Solr security framework. */ diff --git a/solr/core/src/java/org/apache/solr/servlet/BaseSolrFilter.java b/solr/core/src/java/org/apache/solr/servlet/BaseSolrFilter.java index 966bad2916f..6f9bbe65a31 100644 --- a/solr/core/src/java/org/apache/solr/servlet/BaseSolrFilter.java +++ b/solr/core/src/java/org/apache/solr/servlet/BaseSolrFilter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.servlet; import javax.servlet.Filter; diff --git a/solr/core/src/java/org/apache/solr/servlet/BaseSolrServlet.java b/solr/core/src/java/org/apache/solr/servlet/BaseSolrServlet.java index 3a1f88ac333..5042e93f3fe 100644 --- a/solr/core/src/java/org/apache/solr/servlet/BaseSolrServlet.java +++ b/solr/core/src/java/org/apache/solr/servlet/BaseSolrServlet.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.servlet; import javax.servlet.http.HttpServlet; diff --git a/solr/core/src/java/org/apache/solr/servlet/CheckLoggingConfiguration.java b/solr/core/src/java/org/apache/solr/servlet/CheckLoggingConfiguration.java index bd8842cfc74..1d874e6d48a 100644 --- a/solr/core/src/java/org/apache/solr/servlet/CheckLoggingConfiguration.java +++ b/solr/core/src/java/org/apache/solr/servlet/CheckLoggingConfiguration.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.servlet; import org.slf4j.LoggerFactory; diff --git a/solr/core/src/java/org/apache/solr/servlet/DirectSolrConnection.java b/solr/core/src/java/org/apache/solr/servlet/DirectSolrConnection.java index c9976a9528c..d72c4af97fb 100644 --- a/solr/core/src/java/org/apache/solr/servlet/DirectSolrConnection.java +++ b/solr/core/src/java/org/apache/solr/servlet/DirectSolrConnection.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.servlet; import java.io.File; diff --git a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java index 837eb16073e..3578cec2dad 100644 --- a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java +++ b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java @@ -1,7 +1,3 @@ -package org.apache.solr.servlet; - -import javax.servlet.ServletInputStream; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import javax.servlet.ServletInputStream; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.servlet; + +import javax.servlet.ServletInputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/solr/core/src/java/org/apache/solr/servlet/LoadAdminUiServlet.java b/solr/core/src/java/org/apache/solr/servlet/LoadAdminUiServlet.java index d079e4cabb0..992dfe2f4ac 100644 --- a/solr/core/src/java/org/apache/solr/servlet/LoadAdminUiServlet.java +++ b/solr/core/src/java/org/apache/solr/servlet/LoadAdminUiServlet.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.servlet; import org.apache.commons.io.IOUtils; diff --git a/solr/core/src/java/org/apache/solr/servlet/RedirectServlet.java b/solr/core/src/java/org/apache/solr/servlet/RedirectServlet.java index 4661f82b3c6..a1615618d19 100644 --- a/solr/core/src/java/org/apache/solr/servlet/RedirectServlet.java +++ b/solr/core/src/java/org/apache/solr/servlet/RedirectServlet.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.servlet; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/servlet/ResponseUtils.java b/solr/core/src/java/org/apache/solr/servlet/ResponseUtils.java index 682816bbc2c..a2dd8801d61 100644 --- a/solr/core/src/java/org/apache/solr/servlet/ResponseUtils.java +++ b/solr/core/src/java/org/apache/solr/servlet/ResponseUtils.java @@ -1,4 +1,3 @@ -package org.apache.solr.servlet; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.servlet; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.servlet; import org.apache.solr.common.SolrException; import org.apache.solr.common.util.NamedList; import org.slf4j.Logger; diff --git a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java index cc1447373f4..baab3ebd6c0 100644 --- a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java +++ b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.servlet; import javax.servlet.FilterChain; diff --git a/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java b/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java index d8f91341665..79c151b67ee 100644 --- a/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java +++ b/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.servlet; import javax.servlet.http.HttpServletRequest; diff --git a/solr/core/src/java/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java b/solr/core/src/java/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java index 7c0dede2d9f..222ab927c98 100644 --- a/solr/core/src/java/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java +++ b/solr/core/src/java/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.servlet.cache; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/servlet/cache/Method.java b/solr/core/src/java/org/apache/solr/servlet/cache/Method.java index b6c57c7a83b..5c031c3d10d 100644 --- a/solr/core/src/java/org/apache/solr/servlet/cache/Method.java +++ b/solr/core/src/java/org/apache/solr/servlet/cache/Method.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.servlet.cache; import java.util.Locale; diff --git a/solr/core/src/java/org/apache/solr/servlet/cache/package-info.java b/solr/core/src/java/org/apache/solr/servlet/cache/package-info.java index 53bf070ff8a..d05f1b78d1d 100644 --- a/solr/core/src/java/org/apache/solr/servlet/cache/package-info.java +++ b/solr/core/src/java/org/apache/solr/servlet/cache/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Caching related classes used in the Solr HTTP API */ diff --git a/solr/core/src/java/org/apache/solr/servlet/package-info.java b/solr/core/src/java/org/apache/solr/servlet/package-info.java index 1fb8016b61b..eea59935bef 100644 --- a/solr/core/src/java/org/apache/solr/servlet/package-info.java +++ b/solr/core/src/java/org/apache/solr/servlet/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Servlet related classes for powering the Solr HTTP API */ diff --git a/solr/core/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java b/solr/core/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java index 35da5356e1a..941fdaefa40 100644 --- a/solr/core/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java +++ b/solr/core/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java @@ -1,6 +1,3 @@ -package org.apache.solr.spelling; - -import org.apache.lucene.search.spell.StringDistance; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,7 +14,9 @@ import org.apache.lucene.search.spell.StringDistance; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.spelling; +import org.apache.lucene.search.spell.StringDistance; import java.io.File; import java.io.IOException; import java.util.Arrays; diff --git a/solr/core/src/java/org/apache/solr/spelling/ConjunctionSolrSpellChecker.java b/solr/core/src/java/org/apache/solr/spelling/ConjunctionSolrSpellChecker.java index 1f097c8200a..881b4d5c799 100644 --- a/solr/core/src/java/org/apache/solr/spelling/ConjunctionSolrSpellChecker.java +++ b/solr/core/src/java/org/apache/solr/spelling/ConjunctionSolrSpellChecker.java @@ -1,5 +1,3 @@ -package org.apache.solr.spelling; - /* * 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.spelling; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.spelling; import java.io.IOException; import java.util.ArrayList; diff --git a/solr/core/src/java/org/apache/solr/spelling/DirectSolrSpellChecker.java b/solr/core/src/java/org/apache/solr/spelling/DirectSolrSpellChecker.java index 71cff72cb8a..c38b266af28 100644 --- a/solr/core/src/java/org/apache/solr/spelling/DirectSolrSpellChecker.java +++ b/solr/core/src/java/org/apache/solr/spelling/DirectSolrSpellChecker.java @@ -1,5 +1,3 @@ -package org.apache.solr.spelling; - /* * 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.spelling; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.spelling; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java b/solr/core/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java index 343d973b7c4..01601434d64 100644 --- a/solr/core/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java +++ b/solr/core/src/java/org/apache/solr/spelling/IndexBasedSpellChecker.java @@ -1,4 +1,3 @@ -package org.apache.solr.spelling; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.spelling; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.spelling; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriterConfig; diff --git a/solr/core/src/java/org/apache/solr/spelling/PossibilityIterator.java b/solr/core/src/java/org/apache/solr/spelling/PossibilityIterator.java index 0ea275b6cf6..c4a75031317 100644 --- a/solr/core/src/java/org/apache/solr/spelling/PossibilityIterator.java +++ b/solr/core/src/java/org/apache/solr/spelling/PossibilityIterator.java @@ -1,5 +1,3 @@ -package org.apache.solr.spelling; - /* * 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.spelling; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.spelling; import java.util.ArrayList; import java.util.Arrays; diff --git a/solr/core/src/java/org/apache/solr/spelling/QueryConverter.java b/solr/core/src/java/org/apache/solr/spelling/QueryConverter.java index 2c661fa7622..edb94c458fa 100644 --- a/solr/core/src/java/org/apache/solr/spelling/QueryConverter.java +++ b/solr/core/src/java/org/apache/solr/spelling/QueryConverter.java @@ -1,4 +1,3 @@ -package org.apache.solr.spelling; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.spelling; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.spelling; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.Token; import org.apache.solr.common.util.NamedList; diff --git a/solr/core/src/java/org/apache/solr/spelling/ResultEntry.java b/solr/core/src/java/org/apache/solr/spelling/ResultEntry.java index e6f64b5a3e4..4b667cd05ab 100644 --- a/solr/core/src/java/org/apache/solr/spelling/ResultEntry.java +++ b/solr/core/src/java/org/apache/solr/spelling/ResultEntry.java @@ -1,5 +1,3 @@ -package org.apache.solr.spelling; - /* * 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.spelling; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.spelling; import org.apache.lucene.analysis.Token; diff --git a/solr/core/src/java/org/apache/solr/spelling/SolrSpellChecker.java b/solr/core/src/java/org/apache/solr/spelling/SolrSpellChecker.java index 646c19ccc41..db0d5ff8d10 100644 --- a/solr/core/src/java/org/apache/solr/spelling/SolrSpellChecker.java +++ b/solr/core/src/java/org/apache/solr/spelling/SolrSpellChecker.java @@ -1,4 +1,3 @@ -package org.apache.solr.spelling; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.spelling; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.spelling; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.core.WhitespaceAnalyzer; diff --git a/solr/core/src/java/org/apache/solr/spelling/SpellCheckCollation.java b/solr/core/src/java/org/apache/solr/spelling/SpellCheckCollation.java index f6b71a5e220..bef3ec689f7 100644 --- a/solr/core/src/java/org/apache/solr/spelling/SpellCheckCollation.java +++ b/solr/core/src/java/org/apache/solr/spelling/SpellCheckCollation.java @@ -1,5 +1,3 @@ -package org.apache.solr.spelling; - /* * 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.spelling; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.spelling; import org.apache.solr.common.util.NamedList; diff --git a/solr/core/src/java/org/apache/solr/spelling/SpellCheckCollator.java b/solr/core/src/java/org/apache/solr/spelling/SpellCheckCollator.java index 3c142fc062e..528cdc33bf8 100644 --- a/solr/core/src/java/org/apache/solr/spelling/SpellCheckCollator.java +++ b/solr/core/src/java/org/apache/solr/spelling/SpellCheckCollator.java @@ -1,4 +1,3 @@ -package org.apache.solr.spelling; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.spelling; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.spelling; import java.lang.invoke.MethodHandles; import java.util.ArrayList; import java.util.Arrays; diff --git a/solr/core/src/java/org/apache/solr/spelling/SpellCheckCorrection.java b/solr/core/src/java/org/apache/solr/spelling/SpellCheckCorrection.java index a7edda9ed73..cae02568880 100644 --- a/solr/core/src/java/org/apache/solr/spelling/SpellCheckCorrection.java +++ b/solr/core/src/java/org/apache/solr/spelling/SpellCheckCorrection.java @@ -1,4 +1,3 @@ -package org.apache.solr.spelling; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.spelling; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.spelling; import org.apache.lucene.analysis.Token; public class SpellCheckCorrection { diff --git a/solr/core/src/java/org/apache/solr/spelling/SpellingOptions.java b/solr/core/src/java/org/apache/solr/spelling/SpellingOptions.java index d0d211e42fb..e8dd2f0d72b 100644 --- a/solr/core/src/java/org/apache/solr/spelling/SpellingOptions.java +++ b/solr/core/src/java/org/apache/solr/spelling/SpellingOptions.java @@ -1,12 +1,3 @@ -package org.apache.solr.spelling; - -import org.apache.lucene.analysis.Token; -import org.apache.lucene.index.IndexReader; -import org.apache.lucene.search.spell.SuggestMode; -import org.apache.solr.common.params.SolrParams; - -import java.util.Collection; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -23,6 +14,14 @@ import java.util.Collection; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.spelling; + +import org.apache.lucene.analysis.Token; +import org.apache.lucene.index.IndexReader; +import org.apache.lucene.search.spell.SuggestMode; +import org.apache.solr.common.params.SolrParams; + +import java.util.Collection; /** * diff --git a/solr/core/src/java/org/apache/solr/spelling/SpellingQueryConverter.java b/solr/core/src/java/org/apache/solr/spelling/SpellingQueryConverter.java index 5159b01edc4..6499c50a650 100644 --- a/solr/core/src/java/org/apache/solr/spelling/SpellingQueryConverter.java +++ b/solr/core/src/java/org/apache/solr/spelling/SpellingQueryConverter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.spelling; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/spelling/SpellingResult.java b/solr/core/src/java/org/apache/solr/spelling/SpellingResult.java index f69fb696de9..de98c22dd5b 100644 --- a/solr/core/src/java/org/apache/solr/spelling/SpellingResult.java +++ b/solr/core/src/java/org/apache/solr/spelling/SpellingResult.java @@ -1,4 +1,3 @@ -package org.apache.solr.spelling; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.spelling; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.spelling; import org.apache.lucene.analysis.Token; import java.util.Collection; diff --git a/solr/core/src/java/org/apache/solr/spelling/SuggestQueryConverter.java b/solr/core/src/java/org/apache/solr/spelling/SuggestQueryConverter.java index a1014c09c68..a806973e61e 100644 --- a/solr/core/src/java/org/apache/solr/spelling/SuggestQueryConverter.java +++ b/solr/core/src/java/org/apache/solr/spelling/SuggestQueryConverter.java @@ -1,5 +1,3 @@ -package org.apache.solr.spelling; - /* * 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.spelling; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.spelling; import java.io.IOException; import java.util.ArrayList; diff --git a/solr/core/src/java/org/apache/solr/spelling/WordBreakSolrSpellChecker.java b/solr/core/src/java/org/apache/solr/spelling/WordBreakSolrSpellChecker.java index 8ec17b57499..a5d692b6fe2 100644 --- a/solr/core/src/java/org/apache/solr/spelling/WordBreakSolrSpellChecker.java +++ b/solr/core/src/java/org/apache/solr/spelling/WordBreakSolrSpellChecker.java @@ -1,5 +1,3 @@ -package org.apache.solr.spelling; - /* * 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.spelling; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.spelling; import java.io.IOException; import java.util.ArrayList; diff --git a/solr/core/src/java/org/apache/solr/spelling/package-info.java b/solr/core/src/java/org/apache/solr/spelling/package-info.java index f21ac313e7b..7411ebc01df 100644 --- a/solr/core/src/java/org/apache/solr/spelling/package-info.java +++ b/solr/core/src/java/org/apache/solr/spelling/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * APIs and classes used by the {@link org.apache.solr.handler.component.SpellCheckComponent} *

    diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/DictionaryFactory.java b/solr/core/src/java/org/apache/solr/spelling/suggest/DictionaryFactory.java index 831ddaaad33..1bb6e05b18f 100644 --- a/solr/core/src/java/org/apache/solr/spelling/suggest/DictionaryFactory.java +++ b/solr/core/src/java/org/apache/solr/spelling/suggest/DictionaryFactory.java @@ -1,4 +1,3 @@ -package org.apache.solr.spelling.suggest; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.spelling.suggest; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.spelling.suggest; import org.apache.lucene.search.spell.Dictionary; import org.apache.solr.common.util.NamedList; import org.apache.solr.core.SolrCore; diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/DocumentDictionaryFactory.java b/solr/core/src/java/org/apache/solr/spelling/suggest/DocumentDictionaryFactory.java index 71b800b047d..51c025af2c2 100644 --- a/solr/core/src/java/org/apache/solr/spelling/suggest/DocumentDictionaryFactory.java +++ b/solr/core/src/java/org/apache/solr/spelling/suggest/DocumentDictionaryFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.spelling.suggest; - /* * 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.spelling.suggest; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.spelling.suggest; import org.apache.lucene.search.spell.Dictionary; import org.apache.lucene.search.suggest.DocumentDictionary; diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/DocumentExpressionDictionaryFactory.java b/solr/core/src/java/org/apache/solr/spelling/suggest/DocumentExpressionDictionaryFactory.java index 5782ab850ce..24f15533e81 100644 --- a/solr/core/src/java/org/apache/solr/spelling/suggest/DocumentExpressionDictionaryFactory.java +++ b/solr/core/src/java/org/apache/solr/spelling/suggest/DocumentExpressionDictionaryFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.spelling.suggest; - /* * 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.spelling.suggest; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.spelling.suggest; import java.text.ParseException; import java.util.HashSet; diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/FileDictionaryFactory.java b/solr/core/src/java/org/apache/solr/spelling/suggest/FileDictionaryFactory.java index 14333475f07..feb341b0b39 100644 --- a/solr/core/src/java/org/apache/solr/spelling/suggest/FileDictionaryFactory.java +++ b/solr/core/src/java/org/apache/solr/spelling/suggest/FileDictionaryFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.spelling.suggest; - /* * 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.spelling.suggest; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.spelling.suggest; import java.io.IOException; import java.io.InputStreamReader; diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/HighFrequencyDictionaryFactory.java b/solr/core/src/java/org/apache/solr/spelling/suggest/HighFrequencyDictionaryFactory.java index 2d7c42bfd9d..385ef246228 100644 --- a/solr/core/src/java/org/apache/solr/spelling/suggest/HighFrequencyDictionaryFactory.java +++ b/solr/core/src/java/org/apache/solr/spelling/suggest/HighFrequencyDictionaryFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.spelling.suggest; - /* * 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.spelling.suggest; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.spelling.suggest; import org.apache.lucene.search.spell.Dictionary; import org.apache.lucene.search.spell.HighFrequencyDictionary; diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/LookupFactory.java b/solr/core/src/java/org/apache/solr/spelling/suggest/LookupFactory.java index 6e5f55895d2..f6d0312f9cf 100644 --- a/solr/core/src/java/org/apache/solr/spelling/suggest/LookupFactory.java +++ b/solr/core/src/java/org/apache/solr/spelling/suggest/LookupFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.spelling.suggest; - /* * 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.spelling.suggest; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.spelling.suggest; import java.io.IOException; import java.nio.file.Paths; diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/SolrSuggester.java b/solr/core/src/java/org/apache/solr/spelling/suggest/SolrSuggester.java index 54fefe5eae2..3dff0e4a5e2 100644 --- a/solr/core/src/java/org/apache/solr/spelling/suggest/SolrSuggester.java +++ b/solr/core/src/java/org/apache/solr/spelling/suggest/SolrSuggester.java @@ -1,5 +1,3 @@ -package org.apache.solr.spelling.suggest; - /* * 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.spelling.suggest; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.spelling.suggest; import java.io.Closeable; import java.io.File; diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/Suggester.java b/solr/core/src/java/org/apache/solr/spelling/suggest/Suggester.java index d822da99777..d585fed72f3 100644 --- a/solr/core/src/java/org/apache/solr/spelling/suggest/Suggester.java +++ b/solr/core/src/java/org/apache/solr/spelling/suggest/Suggester.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.spelling.suggest; import java.io.Closeable; diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/SuggesterOptions.java b/solr/core/src/java/org/apache/solr/spelling/suggest/SuggesterOptions.java index d91eb1e3359..a64064feb93 100644 --- a/solr/core/src/java/org/apache/solr/spelling/suggest/SuggesterOptions.java +++ b/solr/core/src/java/org/apache/solr/spelling/suggest/SuggesterOptions.java @@ -1,5 +1,3 @@ -package org.apache.solr.spelling.suggest; - /* * 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.spelling.suggest; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.spelling.suggest; import org.apache.lucene.util.CharsRef; diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/SuggesterParams.java b/solr/core/src/java/org/apache/solr/spelling/suggest/SuggesterParams.java index f5ec36a29c4..8dc556f5b4b 100644 --- a/solr/core/src/java/org/apache/solr/spelling/suggest/SuggesterParams.java +++ b/solr/core/src/java/org/apache/solr/spelling/suggest/SuggesterParams.java @@ -1,5 +1,3 @@ -package org.apache.solr.spelling.suggest; - /* * 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.spelling.suggest; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.spelling.suggest; public interface SuggesterParams { public static final String SUGGEST_PREFIX = "suggest."; diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/SuggesterResult.java b/solr/core/src/java/org/apache/solr/spelling/suggest/SuggesterResult.java index 3017349a970..6f01f58ae61 100644 --- a/solr/core/src/java/org/apache/solr/spelling/suggest/SuggesterResult.java +++ b/solr/core/src/java/org/apache/solr/spelling/suggest/SuggesterResult.java @@ -1,5 +1,3 @@ -package org.apache.solr.spelling.suggest; - /* * 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.spelling.suggest; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.spelling.suggest; import java.util.ArrayList; import java.util.HashMap; diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/fst/AnalyzingInfixLookupFactory.java b/solr/core/src/java/org/apache/solr/spelling/suggest/fst/AnalyzingInfixLookupFactory.java index 284cbd23f20..68bfaf64de3 100644 --- a/solr/core/src/java/org/apache/solr/spelling/suggest/fst/AnalyzingInfixLookupFactory.java +++ b/solr/core/src/java/org/apache/solr/spelling/suggest/fst/AnalyzingInfixLookupFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.spelling.suggest.fst; - /* * 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.spelling.suggest.fst; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.spelling.suggest.fst; import java.io.File; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/fst/AnalyzingLookupFactory.java b/solr/core/src/java/org/apache/solr/spelling/suggest/fst/AnalyzingLookupFactory.java index c371c5d33df..eb3ab5fdc48 100644 --- a/solr/core/src/java/org/apache/solr/spelling/suggest/fst/AnalyzingLookupFactory.java +++ b/solr/core/src/java/org/apache/solr/spelling/suggest/fst/AnalyzingLookupFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.spelling.suggest.fst; - /* * 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.spelling.suggest.fst; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.spelling.suggest.fst; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.search.suggest.Lookup; diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/fst/BlendedInfixLookupFactory.java b/solr/core/src/java/org/apache/solr/spelling/suggest/fst/BlendedInfixLookupFactory.java index a5be664ac1b..32a0ff0545d 100644 --- a/solr/core/src/java/org/apache/solr/spelling/suggest/fst/BlendedInfixLookupFactory.java +++ b/solr/core/src/java/org/apache/solr/spelling/suggest/fst/BlendedInfixLookupFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.spelling.suggest.fst; - /* * 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.spelling.suggest.fst; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.spelling.suggest.fst; import java.io.File; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/fst/FSTLookupFactory.java b/solr/core/src/java/org/apache/solr/spelling/suggest/fst/FSTLookupFactory.java index 2912516dca2..ff8d11942f8 100644 --- a/solr/core/src/java/org/apache/solr/spelling/suggest/fst/FSTLookupFactory.java +++ b/solr/core/src/java/org/apache/solr/spelling/suggest/fst/FSTLookupFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.spelling.suggest.fst; - /* * 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.spelling.suggest.fst; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.spelling.suggest.fst; import org.apache.lucene.search.suggest.Lookup; import org.apache.lucene.search.suggest.fst.FSTCompletionLookup; diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/fst/FreeTextLookupFactory.java b/solr/core/src/java/org/apache/solr/spelling/suggest/fst/FreeTextLookupFactory.java index bc44a8be8a9..dfd9d66903e 100644 --- a/solr/core/src/java/org/apache/solr/spelling/suggest/fst/FreeTextLookupFactory.java +++ b/solr/core/src/java/org/apache/solr/spelling/suggest/fst/FreeTextLookupFactory.java @@ -1,15 +1,3 @@ -package org.apache.solr.spelling.suggest.fst; - -import java.nio.charset.StandardCharsets; - -import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.search.suggest.Lookup; -import org.apache.lucene.search.suggest.analyzing.FreeTextSuggester; -import org.apache.solr.common.util.NamedList; -import org.apache.solr.core.SolrCore; -import org.apache.solr.schema.FieldType; -import org.apache.solr.spelling.suggest.LookupFactory; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -26,6 +14,17 @@ import org.apache.solr.spelling.suggest.LookupFactory; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.spelling.suggest.fst; + +import java.nio.charset.StandardCharsets; + +import org.apache.lucene.analysis.Analyzer; +import org.apache.lucene.search.suggest.Lookup; +import org.apache.lucene.search.suggest.analyzing.FreeTextSuggester; +import org.apache.solr.common.util.NamedList; +import org.apache.solr.core.SolrCore; +import org.apache.solr.schema.FieldType; +import org.apache.solr.spelling.suggest.LookupFactory; /** * LookupFactory implementation for {@link FreeTextSuggester} diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/fst/FuzzyLookupFactory.java b/solr/core/src/java/org/apache/solr/spelling/suggest/fst/FuzzyLookupFactory.java index 8855d305044..236bc7b662d 100644 --- a/solr/core/src/java/org/apache/solr/spelling/suggest/fst/FuzzyLookupFactory.java +++ b/solr/core/src/java/org/apache/solr/spelling/suggest/fst/FuzzyLookupFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.spelling.suggest.fst; - /* * 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.spelling.suggest.fst; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.spelling.suggest.fst; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.search.suggest.Lookup; diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/fst/WFSTLookupFactory.java b/solr/core/src/java/org/apache/solr/spelling/suggest/fst/WFSTLookupFactory.java index b10b68aa022..4eca516ff1c 100644 --- a/solr/core/src/java/org/apache/solr/spelling/suggest/fst/WFSTLookupFactory.java +++ b/solr/core/src/java/org/apache/solr/spelling/suggest/fst/WFSTLookupFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.spelling.suggest.fst; - /* * 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.spelling.suggest.fst; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.spelling.suggest.fst; import org.apache.lucene.search.suggest.Lookup; import org.apache.lucene.search.suggest.fst.*; diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/fst/package-info.java b/solr/core/src/java/org/apache/solr/spelling/suggest/fst/package-info.java index 0943b37eb7c..9a509e65a23 100644 --- a/solr/core/src/java/org/apache/solr/spelling/suggest/fst/package-info.java +++ b/solr/core/src/java/org/apache/solr/spelling/suggest/fst/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Factories for {@linkplain org.apache.lucene.search.suggest.fst FST} and {@linkplain org.apache.lucene.search.suggest.analyzing Analyzing} based {@link org.apache.solr.spelling.suggest.Suggester}s */ diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/jaspell/JaspellLookupFactory.java b/solr/core/src/java/org/apache/solr/spelling/suggest/jaspell/JaspellLookupFactory.java index 996347f1ba2..0e613f72988 100644 --- a/solr/core/src/java/org/apache/solr/spelling/suggest/jaspell/JaspellLookupFactory.java +++ b/solr/core/src/java/org/apache/solr/spelling/suggest/jaspell/JaspellLookupFactory.java @@ -1,7 +1,3 @@ -package org.apache.solr.spelling.suggest.jaspell; - -import java.lang.invoke.MethodHandles; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import java.lang.invoke.MethodHandles; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.spelling.suggest.jaspell; + +import java.lang.invoke.MethodHandles; import org.apache.lucene.search.suggest.Lookup; import org.apache.lucene.search.suggest.jaspell.JaspellLookup; diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/jaspell/package-info.java b/solr/core/src/java/org/apache/solr/spelling/suggest/jaspell/package-info.java index 569fe8e5fc0..f3ad70e79b8 100644 --- a/solr/core/src/java/org/apache/solr/spelling/suggest/jaspell/package-info.java +++ b/solr/core/src/java/org/apache/solr/spelling/suggest/jaspell/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Factories for {@linkplain org.apache.lucene.search.suggest.jaspell JaSpell} based {@link org.apache.solr.spelling.suggest.Suggester}s */ diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/package-info.java b/solr/core/src/java/org/apache/solr/spelling/suggest/package-info.java index 9b96e63feea..ae4ce1018c5 100644 --- a/solr/core/src/java/org/apache/solr/spelling/suggest/package-info.java +++ b/solr/core/src/java/org/apache/solr/spelling/suggest/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * APIs and classes used by the {@link org.apache.solr.handler.component.SpellCheckComponent} *

    diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/tst/TSTLookupFactory.java b/solr/core/src/java/org/apache/solr/spelling/suggest/tst/TSTLookupFactory.java index 5ebaf802397..22d350397c4 100644 --- a/solr/core/src/java/org/apache/solr/spelling/suggest/tst/TSTLookupFactory.java +++ b/solr/core/src/java/org/apache/solr/spelling/suggest/tst/TSTLookupFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.spelling.suggest.tst; - /* * 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.spelling.suggest.tst; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.spelling.suggest.tst; import org.apache.lucene.search.suggest.Lookup; import org.apache.lucene.search.suggest.tst.TSTLookup; diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/tst/package-info.java b/solr/core/src/java/org/apache/solr/spelling/suggest/tst/package-info.java index a30041575f7..f930f473fcf 100644 --- a/solr/core/src/java/org/apache/solr/spelling/suggest/tst/package-info.java +++ b/solr/core/src/java/org/apache/solr/spelling/suggest/tst/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Factories for {@linkplain org.apache.lucene.search.suggest.tst TST} based {@link org.apache.solr.spelling.suggest.Suggester}s */ diff --git a/solr/core/src/java/org/apache/solr/store/blockcache/BlockCache.java b/solr/core/src/java/org/apache/solr/store/blockcache/BlockCache.java index 1eeabe291ef..88325ff250c 100644 --- a/solr/core/src/java/org/apache/solr/store/blockcache/BlockCache.java +++ b/solr/core/src/java/org/apache/solr/store/blockcache/BlockCache.java @@ -1,5 +1,3 @@ -package org.apache.solr.store.blockcache; - /* * 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.store.blockcache; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.store.blockcache; import java.nio.ByteBuffer; import java.util.concurrent.ConcurrentMap; diff --git a/solr/core/src/java/org/apache/solr/store/blockcache/BlockCacheKey.java b/solr/core/src/java/org/apache/solr/store/blockcache/BlockCacheKey.java index cf05c6936bc..c5397b1b919 100644 --- a/solr/core/src/java/org/apache/solr/store/blockcache/BlockCacheKey.java +++ b/solr/core/src/java/org/apache/solr/store/blockcache/BlockCacheKey.java @@ -1,5 +1,3 @@ -package org.apache.solr.store.blockcache; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.solr.store.blockcache; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.store.blockcache; + /** * @lucene.experimental */ diff --git a/solr/core/src/java/org/apache/solr/store/blockcache/BlockCacheLocation.java b/solr/core/src/java/org/apache/solr/store/blockcache/BlockCacheLocation.java index c80ff5bbc09..36fb0a65fa0 100644 --- a/solr/core/src/java/org/apache/solr/store/blockcache/BlockCacheLocation.java +++ b/solr/core/src/java/org/apache/solr/store/blockcache/BlockCacheLocation.java @@ -1,5 +1,3 @@ -package org.apache.solr.store.blockcache; - /* * 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.store.blockcache; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.store.blockcache; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/solr/core/src/java/org/apache/solr/store/blockcache/BlockDirectory.java b/solr/core/src/java/org/apache/solr/store/blockcache/BlockDirectory.java index bfec448f3ba..5887e6f8a89 100644 --- a/solr/core/src/java/org/apache/solr/store/blockcache/BlockDirectory.java +++ b/solr/core/src/java/org/apache/solr/store/blockcache/BlockDirectory.java @@ -1,5 +1,3 @@ -package org.apache.solr.store.blockcache; - /* * 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.store.blockcache; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.store.blockcache; import java.io.File; import java.io.FileNotFoundException; diff --git a/solr/core/src/java/org/apache/solr/store/blockcache/BlockDirectoryCache.java b/solr/core/src/java/org/apache/solr/store/blockcache/BlockDirectoryCache.java index 38089eecec7..f926ca22f6e 100644 --- a/solr/core/src/java/org/apache/solr/store/blockcache/BlockDirectoryCache.java +++ b/solr/core/src/java/org/apache/solr/store/blockcache/BlockDirectoryCache.java @@ -1,5 +1,3 @@ -package org.apache.solr.store.blockcache; - /* * 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.store.blockcache; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.store.blockcache; import java.util.Collections; import java.util.HashSet; diff --git a/solr/core/src/java/org/apache/solr/store/blockcache/BlockLocks.java b/solr/core/src/java/org/apache/solr/store/blockcache/BlockLocks.java index ba696506362..766a8fc06cf 100644 --- a/solr/core/src/java/org/apache/solr/store/blockcache/BlockLocks.java +++ b/solr/core/src/java/org/apache/solr/store/blockcache/BlockLocks.java @@ -1,5 +1,3 @@ -package org.apache.solr.store.blockcache; - /* * 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.store.blockcache; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.store.blockcache; import java.util.concurrent.atomic.AtomicLongArray; diff --git a/solr/core/src/java/org/apache/solr/store/blockcache/BufferStore.java b/solr/core/src/java/org/apache/solr/store/blockcache/BufferStore.java index dedbdb2882d..546fb9f0934 100644 --- a/solr/core/src/java/org/apache/solr/store/blockcache/BufferStore.java +++ b/solr/core/src/java/org/apache/solr/store/blockcache/BufferStore.java @@ -1,5 +1,3 @@ -package org.apache.solr.store.blockcache; - /* * 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.store.blockcache; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.store.blockcache; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; diff --git a/solr/core/src/java/org/apache/solr/store/blockcache/Cache.java b/solr/core/src/java/org/apache/solr/store/blockcache/Cache.java index 1a691a4c293..71c05af78d2 100644 --- a/solr/core/src/java/org/apache/solr/store/blockcache/Cache.java +++ b/solr/core/src/java/org/apache/solr/store/blockcache/Cache.java @@ -1,5 +1,3 @@ -package org.apache.solr.store.blockcache; - /* * 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.store.blockcache; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.store.blockcache; /** * @lucene.experimental diff --git a/solr/core/src/java/org/apache/solr/store/blockcache/CachedIndexOutput.java b/solr/core/src/java/org/apache/solr/store/blockcache/CachedIndexOutput.java index 838b6a5f3a0..b0ffa9e8422 100644 --- a/solr/core/src/java/org/apache/solr/store/blockcache/CachedIndexOutput.java +++ b/solr/core/src/java/org/apache/solr/store/blockcache/CachedIndexOutput.java @@ -1,5 +1,3 @@ -package org.apache.solr.store.blockcache; - /* * 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.store.blockcache; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.store.blockcache; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/store/blockcache/CustomBufferedIndexInput.java b/solr/core/src/java/org/apache/solr/store/blockcache/CustomBufferedIndexInput.java index bcefff83a49..6a3a93056c3 100644 --- a/solr/core/src/java/org/apache/solr/store/blockcache/CustomBufferedIndexInput.java +++ b/solr/core/src/java/org/apache/solr/store/blockcache/CustomBufferedIndexInput.java @@ -1,5 +1,3 @@ -package org.apache.solr.store.blockcache; - /* * 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.store.blockcache; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.store.blockcache; import java.io.EOFException; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/store/blockcache/Metrics.java b/solr/core/src/java/org/apache/solr/store/blockcache/Metrics.java index bfe4105b022..75dc4ea5418 100644 --- a/solr/core/src/java/org/apache/solr/store/blockcache/Metrics.java +++ b/solr/core/src/java/org/apache/solr/store/blockcache/Metrics.java @@ -1,5 +1,3 @@ -package org.apache.solr.store.blockcache; - /* * 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.store.blockcache; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.store.blockcache; import java.net.URL; import java.util.Map; diff --git a/solr/core/src/java/org/apache/solr/store/blockcache/ReusedBufferedIndexOutput.java b/solr/core/src/java/org/apache/solr/store/blockcache/ReusedBufferedIndexOutput.java index 85925d02bad..d862539e9f4 100644 --- a/solr/core/src/java/org/apache/solr/store/blockcache/ReusedBufferedIndexOutput.java +++ b/solr/core/src/java/org/apache/solr/store/blockcache/ReusedBufferedIndexOutput.java @@ -1,5 +1,3 @@ -package org.apache.solr.store.blockcache; - /* * 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.store.blockcache; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.store.blockcache; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/store/blockcache/Store.java b/solr/core/src/java/org/apache/solr/store/blockcache/Store.java index 8fb4e48cf38..74fe0fdaf82 100644 --- a/solr/core/src/java/org/apache/solr/store/blockcache/Store.java +++ b/solr/core/src/java/org/apache/solr/store/blockcache/Store.java @@ -1,5 +1,3 @@ -package org.apache.solr.store.blockcache; - /* * 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.store.blockcache; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.store.blockcache; /** * @lucene.experimental diff --git a/solr/core/src/java/org/apache/solr/store/blockcache/package-info.java b/solr/core/src/java/org/apache/solr/store/blockcache/package-info.java index 6da8bb33305..f75b4bf0fbb 100644 --- a/solr/core/src/java/org/apache/solr/store/blockcache/package-info.java +++ b/solr/core/src/java/org/apache/solr/store/blockcache/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * An HDFS blockcache implementation. */ diff --git a/solr/core/src/java/org/apache/solr/store/hdfs/HdfsDirectory.java b/solr/core/src/java/org/apache/solr/store/hdfs/HdfsDirectory.java index bee0f547914..5fc62726d3f 100644 --- a/solr/core/src/java/org/apache/solr/store/hdfs/HdfsDirectory.java +++ b/solr/core/src/java/org/apache/solr/store/hdfs/HdfsDirectory.java @@ -1,5 +1,3 @@ -package org.apache.solr.store.hdfs; - /* * 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.store.hdfs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.store.hdfs; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/java/org/apache/solr/store/hdfs/HdfsFileReader.java b/solr/core/src/java/org/apache/solr/store/hdfs/HdfsFileReader.java index 953b2c3046a..1b63754874a 100644 --- a/solr/core/src/java/org/apache/solr/store/hdfs/HdfsFileReader.java +++ b/solr/core/src/java/org/apache/solr/store/hdfs/HdfsFileReader.java @@ -1,5 +1,3 @@ -package org.apache.solr.store.hdfs; - /* * 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.store.hdfs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.store.hdfs; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/store/hdfs/HdfsFileWriter.java b/solr/core/src/java/org/apache/solr/store/hdfs/HdfsFileWriter.java index 516dedf93af..9111c2c334f 100644 --- a/solr/core/src/java/org/apache/solr/store/hdfs/HdfsFileWriter.java +++ b/solr/core/src/java/org/apache/solr/store/hdfs/HdfsFileWriter.java @@ -1,5 +1,3 @@ -package org.apache.solr.store.hdfs; - /* * 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.store.hdfs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.store.hdfs; import java.io.IOException; import java.io.OutputStream; diff --git a/solr/core/src/java/org/apache/solr/store/hdfs/HdfsLocalityReporter.java b/solr/core/src/java/org/apache/solr/store/hdfs/HdfsLocalityReporter.java index fa0dacbc59a..ba7c7fd1393 100644 --- a/solr/core/src/java/org/apache/solr/store/hdfs/HdfsLocalityReporter.java +++ b/solr/core/src/java/org/apache/solr/store/hdfs/HdfsLocalityReporter.java @@ -1,5 +1,3 @@ -package org.apache.solr.store.hdfs; - /* * 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.store.hdfs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.store.hdfs; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/java/org/apache/solr/store/hdfs/HdfsLockFactory.java b/solr/core/src/java/org/apache/solr/store/hdfs/HdfsLockFactory.java index 9020a9e12f4..c62b5f4a4aa 100644 --- a/solr/core/src/java/org/apache/solr/store/hdfs/HdfsLockFactory.java +++ b/solr/core/src/java/org/apache/solr/store/hdfs/HdfsLockFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.store.hdfs; - /* * 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.store.hdfs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.store.hdfs; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/java/org/apache/solr/store/hdfs/package-info.java b/solr/core/src/java/org/apache/solr/store/hdfs/package-info.java index 5064bcd0198..78ae0bcee7b 100644 --- a/solr/core/src/java/org/apache/solr/store/hdfs/package-info.java +++ b/solr/core/src/java/org/apache/solr/store/hdfs/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * An HDFS Directory implementation. */ diff --git a/solr/core/src/java/org/apache/solr/update/AddUpdateCommand.java b/solr/core/src/java/org/apache/solr/update/AddUpdateCommand.java index 799157e5dd6..407ad30f2a7 100644 --- a/solr/core/src/java/org/apache/solr/update/AddUpdateCommand.java +++ b/solr/core/src/java/org/apache/solr/update/AddUpdateCommand.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update; import java.util.ArrayList; diff --git a/solr/core/src/java/org/apache/solr/update/CdcrTransactionLog.java b/solr/core/src/java/org/apache/solr/update/CdcrTransactionLog.java index 7a83059f3f5..ce992000c8e 100644 --- a/solr/core/src/java/org/apache/solr/update/CdcrTransactionLog.java +++ b/solr/core/src/java/org/apache/solr/update/CdcrTransactionLog.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 @@ -16,6 +14,7 @@ package org.apache.solr.update; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update; import java.io.File; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/update/CdcrUpdateLog.java b/solr/core/src/java/org/apache/solr/update/CdcrUpdateLog.java index e6893322bfd..595791dabcc 100644 --- a/solr/core/src/java/org/apache/solr/update/CdcrUpdateLog.java +++ b/solr/core/src/java/org/apache/solr/update/CdcrUpdateLog.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 @@ -16,6 +14,7 @@ package org.apache.solr.update; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update; import java.io.File; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/update/CommitTracker.java b/solr/core/src/java/org/apache/solr/update/CommitTracker.java index 93e9f32c682..61f0c352630 100644 --- a/solr/core/src/java/org/apache/solr/update/CommitTracker.java +++ b/solr/core/src/java/org/apache/solr/update/CommitTracker.java @@ -1,7 +1,3 @@ -package org.apache.solr.update; - -import java.lang.invoke.MethodHandles; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import java.lang.invoke.MethodHandles; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update; + +import java.lang.invoke.MethodHandles; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; diff --git a/solr/core/src/java/org/apache/solr/update/CommitUpdateCommand.java b/solr/core/src/java/org/apache/solr/update/CommitUpdateCommand.java index 28f9029265d..06122e6d6ed 100644 --- a/solr/core/src/java/org/apache/solr/update/CommitUpdateCommand.java +++ b/solr/core/src/java/org/apache/solr/update/CommitUpdateCommand.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update; import org.apache.solr.request.SolrQueryRequest; diff --git a/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java b/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java index 7be74dc0eb2..8e58c6c14c9 100644 --- a/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java +++ b/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.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 @@ -16,6 +14,7 @@ package org.apache.solr.update; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/java/org/apache/solr/update/DeleteByQueryWrapper.java b/solr/core/src/java/org/apache/solr/update/DeleteByQueryWrapper.java index 5abd0a60807..c0367296817 100644 --- a/solr/core/src/java/org/apache/solr/update/DeleteByQueryWrapper.java +++ b/solr/core/src/java/org/apache/solr/update/DeleteByQueryWrapper.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 @@ -16,6 +14,7 @@ package org.apache.solr.update; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update; import java.io.IOException; import java.util.Set; diff --git a/solr/core/src/java/org/apache/solr/update/DeleteUpdateCommand.java b/solr/core/src/java/org/apache/solr/update/DeleteUpdateCommand.java index 485487851f0..bf41ab336f9 100644 --- a/solr/core/src/java/org/apache/solr/update/DeleteUpdateCommand.java +++ b/solr/core/src/java/org/apache/solr/update/DeleteUpdateCommand.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update; import org.apache.lucene.util.BytesRef; diff --git a/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java b/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java index 85394aa2822..fe14bd5bbda 100644 --- a/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java +++ b/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/update/DocumentBuilder.java b/solr/core/src/java/org/apache/solr/update/DocumentBuilder.java index abc5b25b437..633a6dcea6d 100644 --- a/solr/core/src/java/org/apache/solr/update/DocumentBuilder.java +++ b/solr/core/src/java/org/apache/solr/update/DocumentBuilder.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update; import java.util.List; diff --git a/solr/core/src/java/org/apache/solr/update/HdfsTransactionLog.java b/solr/core/src/java/org/apache/solr/update/HdfsTransactionLog.java index a19e302ef6c..3db65c61887 100644 --- a/solr/core/src/java/org/apache/solr/update/HdfsTransactionLog.java +++ b/solr/core/src/java/org/apache/solr/update/HdfsTransactionLog.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/update/HdfsUpdateLog.java b/solr/core/src/java/org/apache/solr/update/HdfsUpdateLog.java index 17c7828e0ab..aa66391d8c4 100644 --- a/solr/core/src/java/org/apache/solr/update/HdfsUpdateLog.java +++ b/solr/core/src/java/org/apache/solr/update/HdfsUpdateLog.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update; import java.io.FileNotFoundException; diff --git a/solr/core/src/java/org/apache/solr/update/LoggingInfoStream.java b/solr/core/src/java/org/apache/solr/update/LoggingInfoStream.java index 35c5cc8913e..c41953372b2 100644 --- a/solr/core/src/java/org/apache/solr/update/LoggingInfoStream.java +++ b/solr/core/src/java/org/apache/solr/update/LoggingInfoStream.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update; import org.apache.lucene.util.InfoStream; diff --git a/solr/core/src/java/org/apache/solr/update/MemOutputStream.java b/solr/core/src/java/org/apache/solr/update/MemOutputStream.java index fbc3d455260..6fe33bec3c1 100644 --- a/solr/core/src/java/org/apache/solr/update/MemOutputStream.java +++ b/solr/core/src/java/org/apache/solr/update/MemOutputStream.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update; import org.apache.solr.common.util.FastOutputStream; diff --git a/solr/core/src/java/org/apache/solr/update/MergeIndexesCommand.java b/solr/core/src/java/org/apache/solr/update/MergeIndexesCommand.java index 420fa75f5e8..f330a5ced94 100644 --- a/solr/core/src/java/org/apache/solr/update/MergeIndexesCommand.java +++ b/solr/core/src/java/org/apache/solr/update/MergeIndexesCommand.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update; import com.google.common.base.Function; diff --git a/solr/core/src/java/org/apache/solr/update/PeerSync.java b/solr/core/src/java/org/apache/solr/update/PeerSync.java index 1c48f605065..dacb470351a 100644 --- a/solr/core/src/java/org/apache/solr/update/PeerSync.java +++ b/solr/core/src/java/org/apache/solr/update/PeerSync.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/update/RollbackUpdateCommand.java b/solr/core/src/java/org/apache/solr/update/RollbackUpdateCommand.java index 27661358845..d82593365d4 100644 --- a/solr/core/src/java/org/apache/solr/update/RollbackUpdateCommand.java +++ b/solr/core/src/java/org/apache/solr/update/RollbackUpdateCommand.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update; import org.apache.solr.request.SolrQueryRequest; diff --git a/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java b/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java index 0c81bb0f41e..0244b0efc0d 100644 --- a/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.java +++ b/solr/core/src/java/org/apache/solr/update/SolrCmdDistributor.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 @@ -16,6 +14,7 @@ package org.apache.solr.update; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update; import org.apache.http.HttpResponse; import org.apache.solr.client.solrj.SolrClient; diff --git a/solr/core/src/java/org/apache/solr/update/SolrCoreState.java b/solr/core/src/java/org/apache/solr/update/SolrCoreState.java index 03e897f2033..efcf7b32d48 100644 --- a/solr/core/src/java/org/apache/solr/update/SolrCoreState.java +++ b/solr/core/src/java/org/apache/solr/update/SolrCoreState.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 @@ -16,6 +14,7 @@ package org.apache.solr.update; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java b/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java index ab37d8a194f..a1ad771fafc 100644 --- a/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java +++ b/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java b/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java index b0531d4f828..5f1ea0ea46b 100644 --- a/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java +++ b/solr/core/src/java/org/apache/solr/update/SolrIndexSplitter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/update/SolrIndexWriter.java b/solr/core/src/java/org/apache/solr/update/SolrIndexWriter.java index c3378255f2b..8599da1ed3c 100644 --- a/solr/core/src/java/org/apache/solr/update/SolrIndexWriter.java +++ b/solr/core/src/java/org/apache/solr/update/SolrIndexWriter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/update/SplitIndexCommand.java b/solr/core/src/java/org/apache/solr/update/SplitIndexCommand.java index b701f075587..eaa1e597ca5 100644 --- a/solr/core/src/java/org/apache/solr/update/SplitIndexCommand.java +++ b/solr/core/src/java/org/apache/solr/update/SplitIndexCommand.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update; import org.apache.solr.common.cloud.DocRouter; diff --git a/solr/core/src/java/org/apache/solr/update/StreamingSolrClients.java b/solr/core/src/java/org/apache/solr/update/StreamingSolrClients.java index 3ccc98dd8db..0ca814999da 100644 --- a/solr/core/src/java/org/apache/solr/update/StreamingSolrClients.java +++ b/solr/core/src/java/org/apache/solr/update/StreamingSolrClients.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 @@ -16,6 +14,7 @@ package org.apache.solr.update; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; diff --git a/solr/core/src/java/org/apache/solr/update/TransactionLog.java b/solr/core/src/java/org/apache/solr/update/TransactionLog.java index 8c4f4eaa748..474bcafce29 100644 --- a/solr/core/src/java/org/apache/solr/update/TransactionLog.java +++ b/solr/core/src/java/org/apache/solr/update/TransactionLog.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update; import java.io.Closeable; diff --git a/solr/core/src/java/org/apache/solr/update/UpdateCommand.java b/solr/core/src/java/org/apache/solr/update/UpdateCommand.java index 828558a24de..9f015717027 100644 --- a/solr/core/src/java/org/apache/solr/update/UpdateCommand.java +++ b/solr/core/src/java/org/apache/solr/update/UpdateCommand.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update; import org.apache.solr.request.SolrQueryRequest; diff --git a/solr/core/src/java/org/apache/solr/update/UpdateHandler.java b/solr/core/src/java/org/apache/solr/update/UpdateHandler.java index 80659a4e455..f52e3535432 100644 --- a/solr/core/src/java/org/apache/solr/update/UpdateHandler.java +++ b/solr/core/src/java/org/apache/solr/update/UpdateHandler.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update; diff --git a/solr/core/src/java/org/apache/solr/update/UpdateLog.java b/solr/core/src/java/org/apache/solr/update/UpdateLog.java index a2ff5b6dde6..c63d807d297 100644 --- a/solr/core/src/java/org/apache/solr/update/UpdateLog.java +++ b/solr/core/src/java/org/apache/solr/update/UpdateLog.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update; import java.io.Closeable; diff --git a/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java b/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java index acf4ddecfa5..5e805ca6821 100644 --- a/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java +++ b/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.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 @@ -16,6 +14,7 @@ package org.apache.solr.update; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update; import org.apache.http.client.HttpClient; import org.apache.http.conn.ClientConnectionManager; diff --git a/solr/core/src/java/org/apache/solr/update/UpdateShardHandlerConfig.java b/solr/core/src/java/org/apache/solr/update/UpdateShardHandlerConfig.java index e1d3ddf09f2..ffb06c42687 100644 --- a/solr/core/src/java/org/apache/solr/update/UpdateShardHandlerConfig.java +++ b/solr/core/src/java/org/apache/solr/update/UpdateShardHandlerConfig.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 @@ -16,6 +14,7 @@ package org.apache.solr.update; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update; public class UpdateShardHandlerConfig { diff --git a/solr/core/src/java/org/apache/solr/update/VersionBucket.java b/solr/core/src/java/org/apache/solr/update/VersionBucket.java index f7c2c2aed7c..c0c28267ce8 100644 --- a/solr/core/src/java/org/apache/solr/update/VersionBucket.java +++ b/solr/core/src/java/org/apache/solr/update/VersionBucket.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update; // TODO: make inner? diff --git a/solr/core/src/java/org/apache/solr/update/VersionInfo.java b/solr/core/src/java/org/apache/solr/update/VersionInfo.java index 56862852d89..d5eebec883d 100644 --- a/solr/core/src/java/org/apache/solr/update/VersionInfo.java +++ b/solr/core/src/java/org/apache/solr/update/VersionInfo.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/update/package-info.java b/solr/core/src/java/org/apache/solr/update/package-info.java index f7832232e72..2e2d6ab67d6 100644 --- a/solr/core/src/java/org/apache/solr/update/package-info.java +++ b/solr/core/src/java/org/apache/solr/update/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * APIs and classes for managing index updates */ diff --git a/solr/core/src/java/org/apache/solr/update/processor/AbstractDefaultValueUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/AbstractDefaultValueUpdateProcessorFactory.java index d4448b60f45..51989e3c7a4 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/AbstractDefaultValueUpdateProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/AbstractDefaultValueUpdateProcessorFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactory.java index b71c1a28c14..01106b265ff 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import org.apache.solr.common.SolrException; diff --git a/solr/core/src/java/org/apache/solr/update/processor/AllValuesOrNoneFieldMutatingUpdateProcessor.java b/solr/core/src/java/org/apache/solr/update/processor/AllValuesOrNoneFieldMutatingUpdateProcessor.java index 30a7158e132..5169435d8bf 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/AllValuesOrNoneFieldMutatingUpdateProcessor.java +++ b/solr/core/src/java/org/apache/solr/update/processor/AllValuesOrNoneFieldMutatingUpdateProcessor.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import org.apache.solr.common.SolrInputField; diff --git a/solr/core/src/java/org/apache/solr/update/processor/AtomicUpdateDocumentMerger.java b/solr/core/src/java/org/apache/solr/update/processor/AtomicUpdateDocumentMerger.java index 95376f573cc..452574e4273 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/AtomicUpdateDocumentMerger.java +++ b/solr/core/src/java/org/apache/solr/update/processor/AtomicUpdateDocumentMerger.java @@ -1,7 +1,3 @@ -package org.apache.solr.update.processor; - -import java.lang.invoke.MethodHandles; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import java.lang.invoke.MethodHandles; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update.processor; + +import java.lang.invoke.MethodHandles; import java.util.Collection; import java.util.HashSet; diff --git a/solr/core/src/java/org/apache/solr/update/processor/CdcrUpdateProcessor.java b/solr/core/src/java/org/apache/solr/update/processor/CdcrUpdateProcessor.java index a4e1f7bf68d..3b3fcb420ad 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/CdcrUpdateProcessor.java +++ b/solr/core/src/java/org/apache/solr/update/processor/CdcrUpdateProcessor.java @@ -1,5 +1,3 @@ -package org.apache.solr.update.processor; - /* * 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.update.processor; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update.processor; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/java/org/apache/solr/update/processor/CdcrUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/CdcrUpdateProcessorFactory.java index 0afefb16bd7..250565879d0 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/CdcrUpdateProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/CdcrUpdateProcessorFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.update.processor; - /* * 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.update.processor; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update.processor; import org.apache.solr.common.util.NamedList; import org.apache.solr.request.SolrQueryRequest; diff --git a/solr/core/src/java/org/apache/solr/update/processor/ConcatFieldUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/ConcatFieldUpdateProcessorFactory.java index 56fee5842ab..34b92b04db8 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/ConcatFieldUpdateProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/ConcatFieldUpdateProcessorFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import org.apache.solr.core.SolrCore; diff --git a/solr/core/src/java/org/apache/solr/update/processor/CountFieldValuesUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/CountFieldValuesUpdateProcessorFactory.java index 1b72675bc4b..26655d829fe 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/CountFieldValuesUpdateProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/CountFieldValuesUpdateProcessorFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import org.apache.solr.core.SolrCore; diff --git a/solr/core/src/java/org/apache/solr/update/processor/DefaultValueUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/DefaultValueUpdateProcessorFactory.java index 4ca6c05d1b5..225bf1c84a9 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/DefaultValueUpdateProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/DefaultValueUpdateProcessorFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java b/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java index 9c691f4f1be..6c3b0945b45 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java +++ b/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java @@ -1,7 +1,3 @@ -package org.apache.solr.update.processor; - -import static org.apache.solr.update.processor.DistributingUpdateProcessorFactory.DISTRIB_UPDATE_PARAM; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import static org.apache.solr.update.processor.DistributingUpdateProcessorFactor * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update.processor; + +import static org.apache.solr.update.processor.DistributingUpdateProcessorFactory.DISTRIB_UPDATE_PARAM; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessorFactory.java index 6f7e23421e5..4b64dec77e9 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessorFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.update.processor; - /* * 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.update.processor; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update.processor; import org.apache.solr.common.util.NamedList; import org.apache.solr.request.SolrQueryRequest; diff --git a/solr/core/src/java/org/apache/solr/update/processor/DistributingUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/DistributingUpdateProcessorFactory.java index 9ec2a629978..1a2c8e0d3a2 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/DistributingUpdateProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/DistributingUpdateProcessorFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import org.apache.solr.common.SolrException; diff --git a/solr/core/src/java/org/apache/solr/update/processor/DocBasedVersionConstraintsProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/DocBasedVersionConstraintsProcessorFactory.java index cd5db4fa311..4ecf37168c9 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/DocBasedVersionConstraintsProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/DocBasedVersionConstraintsProcessorFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import org.apache.lucene.queries.function.FunctionValues; diff --git a/solr/core/src/java/org/apache/solr/update/processor/DocExpirationUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/DocExpirationUpdateProcessorFactory.java index 533b92f887b..586efc9f46a 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/DocExpirationUpdateProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/DocExpirationUpdateProcessorFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/update/processor/FieldLengthUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/FieldLengthUpdateProcessorFactory.java index e01d8bf8ef2..3b6b3383150 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/FieldLengthUpdateProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/FieldLengthUpdateProcessorFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import org.apache.solr.common.util.NamedList; diff --git a/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessor.java b/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessor.java index 7ea704bea06..c3bc2adf12c 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessor.java +++ b/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessor.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessorFactory.java index 9803bec7306..a5c4969a603 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessorFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import java.util.ArrayList; diff --git a/solr/core/src/java/org/apache/solr/update/processor/FieldNameMutatingUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/FieldNameMutatingUpdateProcessorFactory.java index b72475a6046..1c53732176b 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/FieldNameMutatingUpdateProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/FieldNameMutatingUpdateProcessorFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.update.processor; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,7 +14,7 @@ package org.apache.solr.update.processor; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.update.processor; import java.io.IOException; import java.util.ArrayList; diff --git a/solr/core/src/java/org/apache/solr/update/processor/FieldValueMutatingUpdateProcessor.java b/solr/core/src/java/org/apache/solr/update/processor/FieldValueMutatingUpdateProcessor.java index e174d7a7a1a..0d4e1144693 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/FieldValueMutatingUpdateProcessor.java +++ b/solr/core/src/java/org/apache/solr/update/processor/FieldValueMutatingUpdateProcessor.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/java/org/apache/solr/update/processor/FieldValueSubsetUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/FieldValueSubsetUpdateProcessorFactory.java index 4ab5d673c6e..d4684123e39 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/FieldValueSubsetUpdateProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/FieldValueSubsetUpdateProcessorFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import org.apache.solr.core.SolrCore; diff --git a/solr/core/src/java/org/apache/solr/update/processor/FirstFieldValueUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/FirstFieldValueUpdateProcessorFactory.java index a40dcf701b2..fef1f6a8123 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/FirstFieldValueUpdateProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/FirstFieldValueUpdateProcessorFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import org.apache.solr.core.SolrCore; diff --git a/solr/core/src/java/org/apache/solr/update/processor/HTMLStripFieldUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/HTMLStripFieldUpdateProcessorFactory.java index 7dbb58042d7..491920cb109 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/HTMLStripFieldUpdateProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/HTMLStripFieldUpdateProcessorFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import org.apache.solr.core.SolrCore; diff --git a/solr/core/src/java/org/apache/solr/update/processor/IgnoreCommitOptimizeUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/IgnoreCommitOptimizeUpdateProcessorFactory.java index 91f4985a08e..31622ffd2c8 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/IgnoreCommitOptimizeUpdateProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/IgnoreCommitOptimizeUpdateProcessorFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import static org.apache.solr.common.SolrException.ErrorCode; diff --git a/solr/core/src/java/org/apache/solr/update/processor/IgnoreFieldUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/IgnoreFieldUpdateProcessorFactory.java index 6814ddd7cb2..245d9fedbff 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/IgnoreFieldUpdateProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/IgnoreFieldUpdateProcessorFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import org.apache.solr.core.SolrCore; diff --git a/solr/core/src/java/org/apache/solr/update/processor/LastFieldValueUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/LastFieldValueUpdateProcessorFactory.java index 2138d412675..371f4f27154 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/LastFieldValueUpdateProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/LastFieldValueUpdateProcessorFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import org.apache.solr.core.SolrCore; diff --git a/solr/core/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java index 740455b1211..66ec93f4882 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/LogUpdateProcessorFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/update/processor/Lookup3Signature.java b/solr/core/src/java/org/apache/solr/update/processor/Lookup3Signature.java index ab812622bf9..1869d84ed8f 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/Lookup3Signature.java +++ b/solr/core/src/java/org/apache/solr/update/processor/Lookup3Signature.java @@ -1,4 +1,3 @@ -package org.apache.solr.update.processor; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.update.processor; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.update.processor; import org.apache.solr.common.util.Hash; public class Lookup3Signature extends Signature { diff --git a/solr/core/src/java/org/apache/solr/update/processor/MD5Signature.java b/solr/core/src/java/org/apache/solr/update/processor/MD5Signature.java index 408e212e303..78baf10adbc 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/MD5Signature.java +++ b/solr/core/src/java/org/apache/solr/update/processor/MD5Signature.java @@ -1,4 +1,3 @@ -package org.apache.solr.update.processor; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.update.processor; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.update.processor; import java.io.UnsupportedEncodingException; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; diff --git a/solr/core/src/java/org/apache/solr/update/processor/MaxFieldValueUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/MaxFieldValueUpdateProcessorFactory.java index 6b19d5ba875..7315fd2f405 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/MaxFieldValueUpdateProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/MaxFieldValueUpdateProcessorFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import static org.apache.solr.common.SolrException.ErrorCode.*; diff --git a/solr/core/src/java/org/apache/solr/update/processor/MinFieldValueUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/MinFieldValueUpdateProcessorFactory.java index eb248d14bd4..380e4e27ba5 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/MinFieldValueUpdateProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/MinFieldValueUpdateProcessorFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import static org.apache.solr.common.SolrException.ErrorCode.*; diff --git a/solr/core/src/java/org/apache/solr/update/processor/NoOpDistributingUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/NoOpDistributingUpdateProcessorFactory.java index c6e872f6c3d..b2e8ba8941a 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/NoOpDistributingUpdateProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/NoOpDistributingUpdateProcessorFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import org.apache.solr.common.util.NamedList; diff --git a/solr/core/src/java/org/apache/solr/update/processor/ParseBooleanFieldUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/ParseBooleanFieldUpdateProcessorFactory.java index b0bd1129383..cfa9cc8dfc9 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/ParseBooleanFieldUpdateProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/ParseBooleanFieldUpdateProcessorFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import org.apache.solr.common.SolrException; diff --git a/solr/core/src/java/org/apache/solr/update/processor/ParseDateFieldUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/ParseDateFieldUpdateProcessorFactory.java index e2914ecccfe..a0aba583185 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/ParseDateFieldUpdateProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/ParseDateFieldUpdateProcessorFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import org.apache.commons.lang.LocaleUtils; diff --git a/solr/core/src/java/org/apache/solr/update/processor/ParseDoubleFieldUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/ParseDoubleFieldUpdateProcessorFactory.java index 3da72381490..c2d2e8ec476 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/ParseDoubleFieldUpdateProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/ParseDoubleFieldUpdateProcessorFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import org.apache.solr.request.SolrQueryRequest; diff --git a/solr/core/src/java/org/apache/solr/update/processor/ParseFloatFieldUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/ParseFloatFieldUpdateProcessorFactory.java index 3b5c0ff0d04..778e7775cd6 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/ParseFloatFieldUpdateProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/ParseFloatFieldUpdateProcessorFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import org.apache.solr.request.SolrQueryRequest; diff --git a/solr/core/src/java/org/apache/solr/update/processor/ParseIntFieldUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/ParseIntFieldUpdateProcessorFactory.java index 0ac332d0610..eebc7ff54d7 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/ParseIntFieldUpdateProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/ParseIntFieldUpdateProcessorFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import org.apache.solr.request.SolrQueryRequest; diff --git a/solr/core/src/java/org/apache/solr/update/processor/ParseLongFieldUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/ParseLongFieldUpdateProcessorFactory.java index 037a0c50e1c..bc7d1da142b 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/ParseLongFieldUpdateProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/ParseLongFieldUpdateProcessorFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import org.apache.solr.request.SolrQueryRequest; diff --git a/solr/core/src/java/org/apache/solr/update/processor/ParseNumericFieldUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/ParseNumericFieldUpdateProcessorFactory.java index 20bc67e91ee..f19e8d157a0 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/ParseNumericFieldUpdateProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/ParseNumericFieldUpdateProcessorFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import org.apache.commons.lang.LocaleUtils; diff --git a/solr/core/src/java/org/apache/solr/update/processor/PreAnalyzedUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/PreAnalyzedUpdateProcessorFactory.java index a3a74d7562b..2b76fbf0424 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/PreAnalyzedUpdateProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/PreAnalyzedUpdateProcessorFactory.java @@ -1,3 +1,19 @@ +/* + * 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.lang.invoke.MethodHandles; @@ -22,23 +38,6 @@ import org.apache.solr.schema.SimplePreAnalyzedParser; 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. - */ - /** *

    An update processor that parses configured fields of any document being added * using {@link PreAnalyzedField} with the configured format parser.

    diff --git a/solr/core/src/java/org/apache/solr/update/processor/RemoveBlankFieldUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/RemoveBlankFieldUpdateProcessorFactory.java index 7621a09ae90..400765b8dc6 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/RemoveBlankFieldUpdateProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/RemoveBlankFieldUpdateProcessorFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import org.apache.solr.common.util.NamedList; diff --git a/solr/core/src/java/org/apache/solr/update/processor/RunUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/RunUpdateProcessorFactory.java index c969586429f..0e401953e7d 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/RunUpdateProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/RunUpdateProcessorFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/update/processor/ScriptEngineCustomizer.java b/solr/core/src/java/org/apache/solr/update/processor/ScriptEngineCustomizer.java index 8def2e3f7f4..f230526b624 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/ScriptEngineCustomizer.java +++ b/solr/core/src/java/org/apache/solr/update/processor/ScriptEngineCustomizer.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import javax.script.ScriptEngine; diff --git a/solr/core/src/java/org/apache/solr/update/processor/Signature.java b/solr/core/src/java/org/apache/solr/update/processor/Signature.java index b9684f08754..b0f9930aaae 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/Signature.java +++ b/solr/core/src/java/org/apache/solr/update/processor/Signature.java @@ -1,4 +1,3 @@ -package org.apache.solr.update.processor; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.update.processor; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.update.processor; import org.apache.solr.common.params.SolrParams; public abstract class Signature { diff --git a/solr/core/src/java/org/apache/solr/update/processor/SignatureUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/SignatureUpdateProcessorFactory.java index f6ed26203c6..40ef3983c7d 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/SignatureUpdateProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/SignatureUpdateProcessorFactory.java @@ -1,4 +1,3 @@ -package org.apache.solr.update.processor; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.update.processor; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.update.processor; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; diff --git a/solr/core/src/java/org/apache/solr/update/processor/SimpleUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/SimpleUpdateProcessorFactory.java index af4619cea66..e9c5b2d83c6 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/SimpleUpdateProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/SimpleUpdateProcessorFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.update.processor; - /* * 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.update.processor; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update.processor; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/update/processor/StatelessScriptUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/StatelessScriptUpdateProcessorFactory.java index c645206e772..72da7b5d37c 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/StatelessScriptUpdateProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/StatelessScriptUpdateProcessorFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.update.processor; - /* * 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.update.processor; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update.processor; import org.apache.solr.common.SolrException; import org.apache.solr.common.util.NamedList; diff --git a/solr/core/src/java/org/apache/solr/update/processor/TextProfileSignature.java b/solr/core/src/java/org/apache/solr/update/processor/TextProfileSignature.java index 8a4bd2a7b31..2e78e6530cf 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/TextProfileSignature.java +++ b/solr/core/src/java/org/apache/solr/update/processor/TextProfileSignature.java @@ -1,4 +1,3 @@ -package org.apache.solr.update.processor; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.update.processor; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.update.processor; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; diff --git a/solr/core/src/java/org/apache/solr/update/processor/TimestampUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/TimestampUpdateProcessorFactory.java index 1dca49dc509..792ee204426 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/TimestampUpdateProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/TimestampUpdateProcessorFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/update/processor/TrimFieldUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/TrimFieldUpdateProcessorFactory.java index 1f2751d1e15..35201351930 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/TrimFieldUpdateProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/TrimFieldUpdateProcessorFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import org.apache.solr.common.util.NamedList; diff --git a/solr/core/src/java/org/apache/solr/update/processor/TruncateFieldUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/TruncateFieldUpdateProcessorFactory.java index 0e77eef3cce..1925b1b9124 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/TruncateFieldUpdateProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/TruncateFieldUpdateProcessorFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import org.apache.solr.common.SolrException; diff --git a/solr/core/src/java/org/apache/solr/update/processor/UUIDUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/UUIDUpdateProcessorFactory.java index ee2709fed03..ff8ff838239 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/UUIDUpdateProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/UUIDUpdateProcessorFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import java.util.UUID; diff --git a/solr/core/src/java/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactory.java index f8f7a296ac1..67cead56056 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.update.processor; - /* * 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.update.processor; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update.processor; import java.io.IOException; import java.util.ArrayList; diff --git a/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessor.java b/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessor.java index ccd24c3ac37..0a51d6357d7 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessor.java +++ b/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessor.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessorChain.java b/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessorChain.java index ed98e529f24..ca2e5ce6340 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessorChain.java +++ b/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessorChain.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import org.apache.solr.common.params.MapSolrParams; diff --git a/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessorFactory.java index ad42c39fe25..5e3a4738a4c 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessorFactory.java +++ b/solr/core/src/java/org/apache/solr/update/processor/UpdateRequestProcessorFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import org.apache.solr.common.util.NamedList; diff --git a/solr/core/src/java/org/apache/solr/update/processor/package-info.java b/solr/core/src/java/org/apache/solr/update/processor/package-info.java index ab20391e6f6..3751d35371c 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/package-info.java +++ b/solr/core/src/java/org/apache/solr/update/processor/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * {@link org.apache.solr.update.processor.UpdateRequestProcessorFactory} APIs and implementations for use in {@link org.apache.solr.update.processor.UpdateRequestProcessorChain}s diff --git a/solr/core/src/java/org/apache/solr/util/AdjustableSemaphore.java b/solr/core/src/java/org/apache/solr/util/AdjustableSemaphore.java index 5c0e85cc830..3037027856b 100644 --- a/solr/core/src/java/org/apache/solr/util/AdjustableSemaphore.java +++ b/solr/core/src/java/org/apache/solr/util/AdjustableSemaphore.java @@ -1,5 +1,3 @@ -package org.apache.solr.util; - /* * 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.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; import java.util.concurrent.Semaphore; diff --git a/solr/core/src/java/org/apache/solr/util/BoundedTreeSet.java b/solr/core/src/java/org/apache/solr/util/BoundedTreeSet.java index 397b8162ef1..cb99d8dffc9 100644 --- a/solr/core/src/java/org/apache/solr/util/BoundedTreeSet.java +++ b/solr/core/src/java/org/apache/solr/util/BoundedTreeSet.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.apache.solr.util; import java.util.*; diff --git a/solr/core/src/java/org/apache/solr/util/CommandOperation.java b/solr/core/src/java/org/apache/solr/util/CommandOperation.java index dfc1e4afde9..b6a786890fd 100644 --- a/solr/core/src/java/org/apache/solr/util/CommandOperation.java +++ b/solr/core/src/java/org/apache/solr/util/CommandOperation.java @@ -1,5 +1,3 @@ -package org.apache.solr.util; - /* * 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.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; import java.io.IOException; import java.io.Reader; diff --git a/solr/core/src/java/org/apache/solr/util/ConcurrentLFUCache.java b/solr/core/src/java/org/apache/solr/util/ConcurrentLFUCache.java index e7345b618e3..25b9342a7eb 100644 --- a/solr/core/src/java/org/apache/solr/util/ConcurrentLFUCache.java +++ b/solr/core/src/java/org/apache/solr/util/ConcurrentLFUCache.java @@ -1,4 +1,3 @@ -package org.apache.solr.util; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -10,12 +9,12 @@ package org.apache.solr.util; * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software - * 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.util; import org.apache.solr.common.util.Cache; import org.slf4j.Logger; diff --git a/solr/core/src/java/org/apache/solr/util/ConcurrentLRUCache.java b/solr/core/src/java/org/apache/solr/util/ConcurrentLRUCache.java index e9a985f06c7..3b02ed65418 100644 --- a/solr/core/src/java/org/apache/solr/util/ConcurrentLRUCache.java +++ b/solr/core/src/java/org/apache/solr/util/ConcurrentLRUCache.java @@ -1,4 +1,3 @@ -package org.apache.solr.util; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.util; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.util; import org.apache.lucene.util.PriorityQueue; import org.apache.solr.common.util.Cache; import org.slf4j.Logger; diff --git a/solr/core/src/java/org/apache/solr/util/CryptoKeys.java b/solr/core/src/java/org/apache/solr/util/CryptoKeys.java index 5465a2b2bc6..c110aebcf45 100644 --- a/solr/core/src/java/org/apache/solr/util/CryptoKeys.java +++ b/solr/core/src/java/org/apache/solr/util/CryptoKeys.java @@ -1,5 +1,3 @@ -package org.apache.solr.util; - /* * 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.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; import javax.crypto.BadPaddingException; import javax.crypto.Cipher; diff --git a/solr/core/src/java/org/apache/solr/util/DOMUtil.java b/solr/core/src/java/org/apache/solr/util/DOMUtil.java index a75bf8861ea..773d08cbb57 100644 --- a/solr/core/src/java/org/apache/solr/util/DOMUtil.java +++ b/solr/core/src/java/org/apache/solr/util/DOMUtil.java @@ -1,5 +1,3 @@ -package org.apache.solr.util; - /* * 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.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; import java.util.ArrayList; import java.util.HashMap; diff --git a/solr/core/src/java/org/apache/solr/util/DateFormatUtil.java b/solr/core/src/java/org/apache/solr/util/DateFormatUtil.java index b3268da9027..b4e33be60ec 100644 --- a/solr/core/src/java/org/apache/solr/util/DateFormatUtil.java +++ b/solr/core/src/java/org/apache/solr/util/DateFormatUtil.java @@ -1,5 +1,3 @@ -package org.apache.solr.util; - /* * 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.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; import java.text.DateFormat; import java.text.DecimalFormat; diff --git a/solr/core/src/java/org/apache/solr/util/DateMathParser.java b/solr/core/src/java/org/apache/solr/util/DateMathParser.java index 3730e582107..9e750dcb9a1 100644 --- a/solr/core/src/java/org/apache/solr/util/DateMathParser.java +++ b/solr/core/src/java/org/apache/solr/util/DateMathParser.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.util; import org.apache.solr.request.SolrRequestInfo; diff --git a/solr/core/src/java/org/apache/solr/util/DefaultSolrThreadFactory.java b/solr/core/src/java/org/apache/solr/util/DefaultSolrThreadFactory.java index 85868305322..3037f6abacf 100644 --- a/solr/core/src/java/org/apache/solr/util/DefaultSolrThreadFactory.java +++ b/solr/core/src/java/org/apache/solr/util/DefaultSolrThreadFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.util; - /* * 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.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; import java.util.concurrent.ThreadFactory; import java.util.concurrent.atomic.AtomicInteger; diff --git a/solr/core/src/java/org/apache/solr/util/DistanceUnits.java b/solr/core/src/java/org/apache/solr/util/DistanceUnits.java index e2abcb9eedd..7785bc9466c 100644 --- a/solr/core/src/java/org/apache/solr/util/DistanceUnits.java +++ b/solr/core/src/java/org/apache/solr/util/DistanceUnits.java @@ -1,13 +1,3 @@ -package org.apache.solr.util; - -import java.util.HashMap; -import java.util.Map; -import java.util.Set; - -import com.google.common.collect.ImmutableMap; -import com.spatial4j.core.distance.DistanceUtils; -import org.apache.solr.schema.AbstractSpatialFieldType; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -24,6 +14,15 @@ import org.apache.solr.schema.AbstractSpatialFieldType; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; + +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +import com.google.common.collect.ImmutableMap; +import com.spatial4j.core.distance.DistanceUtils; +import org.apache.solr.schema.AbstractSpatialFieldType; /** * Used with a spatial field type for all distance measurements. diff --git a/solr/core/src/java/org/apache/solr/util/FSHDFSUtils.java b/solr/core/src/java/org/apache/solr/util/FSHDFSUtils.java index 23a265921f2..e806babfe90 100644 --- a/solr/core/src/java/org/apache/solr/util/FSHDFSUtils.java +++ b/solr/core/src/java/org/apache/solr/util/FSHDFSUtils.java @@ -1,5 +1,3 @@ -package org.apache.solr.util; - /* * 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.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/util/FastWriter.java b/solr/core/src/java/org/apache/solr/util/FastWriter.java index 363cf223221..7b9b6877cf1 100644 --- a/solr/core/src/java/org/apache/solr/util/FastWriter.java +++ b/solr/core/src/java/org/apache/solr/util/FastWriter.java @@ -1,5 +1,3 @@ -package org.apache.solr.util; - /* * 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.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; import java.io.Writer; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/util/FileUtils.java b/solr/core/src/java/org/apache/solr/util/FileUtils.java index c8229a6d3d1..48148f6f5bc 100644 --- a/solr/core/src/java/org/apache/solr/util/FileUtils.java +++ b/solr/core/src/java/org/apache/solr/util/FileUtils.java @@ -1,5 +1,3 @@ -package org.apache.solr.util; - /* * 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.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; import java.io.*; import java.nio.channels.FileChannel; diff --git a/solr/core/src/java/org/apache/solr/util/HdfsUtil.java b/solr/core/src/java/org/apache/solr/util/HdfsUtil.java index 1805f4025d9..799ddca26ed 100644 --- a/solr/core/src/java/org/apache/solr/util/HdfsUtil.java +++ b/solr/core/src/java/org/apache/solr/util/HdfsUtil.java @@ -1,12 +1,3 @@ -package org.apache.solr.util; - -import java.io.File; - -import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.fs.Path; -import org.apache.solr.common.SolrException; -import org.apache.solr.common.SolrException.ErrorCode; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -23,6 +14,14 @@ import org.apache.solr.common.SolrException.ErrorCode; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; + +import java.io.File; + +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.Path; +import org.apache.solr.common.SolrException; +import org.apache.solr.common.SolrException.ErrorCode; public class HdfsUtil { diff --git a/solr/core/src/java/org/apache/solr/util/LongPriorityQueue.java b/solr/core/src/java/org/apache/solr/util/LongPriorityQueue.java index e02a01c4a99..b1c3289beab 100644 --- a/solr/core/src/java/org/apache/solr/util/LongPriorityQueue.java +++ b/solr/core/src/java/org/apache/solr/util/LongPriorityQueue.java @@ -1,7 +1,3 @@ -package org.apache.solr.util; - -import java.util.Arrays; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import java.util.Arrays; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; + +import java.util.Arrays; /** A native long priority queue. * diff --git a/solr/core/src/java/org/apache/solr/util/MapListener.java b/solr/core/src/java/org/apache/solr/util/MapListener.java index c74ccada91d..3fc044df1d2 100644 --- a/solr/core/src/java/org/apache/solr/util/MapListener.java +++ b/solr/core/src/java/org/apache/solr/util/MapListener.java @@ -1,5 +1,3 @@ -package org.apache.solr.util; - /* * 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.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; import com.google.common.collect.ForwardingMap; diff --git a/solr/core/src/java/org/apache/solr/util/NumberUtils.java b/solr/core/src/java/org/apache/solr/util/NumberUtils.java index 1525342663f..a4e32672c83 100644 --- a/solr/core/src/java/org/apache/solr/util/NumberUtils.java +++ b/solr/core/src/java/org/apache/solr/util/NumberUtils.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.util; import java.text.NumberFormat; diff --git a/solr/core/src/java/org/apache/solr/util/PivotListEntry.java b/solr/core/src/java/org/apache/solr/util/PivotListEntry.java index 6e9a16bef86..9f580c0c136 100644 --- a/solr/core/src/java/org/apache/solr/util/PivotListEntry.java +++ b/solr/core/src/java/org/apache/solr/util/PivotListEntry.java @@ -1,5 +1,3 @@ -package org.apache.solr.util; - /* * 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.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException.ErrorCode; diff --git a/solr/core/src/java/org/apache/solr/util/PrimUtils.java b/solr/core/src/java/org/apache/solr/util/PrimUtils.java index 970de80033b..68f986a622d 100644 --- a/solr/core/src/java/org/apache/solr/util/PrimUtils.java +++ b/solr/core/src/java/org/apache/solr/util/PrimUtils.java @@ -1,4 +1,3 @@ -package org.apache.solr.util; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.util; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.util; /** Utilities for primitive Java data types. */ public class PrimUtils { diff --git a/solr/core/src/java/org/apache/solr/util/PropertiesInputStream.java b/solr/core/src/java/org/apache/solr/util/PropertiesInputStream.java index 9de35f1d8da..537b9814568 100644 --- a/solr/core/src/java/org/apache/solr/util/PropertiesInputStream.java +++ b/solr/core/src/java/org/apache/solr/util/PropertiesInputStream.java @@ -1,5 +1,3 @@ -package org.apache.solr.util; - /* * 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.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; import java.io.EOFException; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/util/PropertiesOutputStream.java b/solr/core/src/java/org/apache/solr/util/PropertiesOutputStream.java index 0cfc86c84b3..4b34f0b4e12 100644 --- a/solr/core/src/java/org/apache/solr/util/PropertiesOutputStream.java +++ b/solr/core/src/java/org/apache/solr/util/PropertiesOutputStream.java @@ -1,5 +1,3 @@ -package org.apache.solr.util; - /* * 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.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; import java.io.IOException; import java.io.OutputStream; diff --git a/solr/core/src/java/org/apache/solr/util/PropertiesUtil.java b/solr/core/src/java/org/apache/solr/util/PropertiesUtil.java index 20f594d0ddf..569239a5101 100644 --- a/solr/core/src/java/org/apache/solr/util/PropertiesUtil.java +++ b/solr/core/src/java/org/apache/solr/util/PropertiesUtil.java @@ -1,5 +1,3 @@ -package org.apache.solr.util; - /* * 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.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; import org.apache.solr.common.SolrException; diff --git a/solr/core/src/java/org/apache/solr/util/RTimer.java b/solr/core/src/java/org/apache/solr/util/RTimer.java index 9cfa7a49862..7bf075cafef 100644 --- a/solr/core/src/java/org/apache/solr/util/RTimer.java +++ b/solr/core/src/java/org/apache/solr/util/RTimer.java @@ -1,5 +1,3 @@ -package org.apache.solr.util; - /* * 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.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; import java.util.concurrent.TimeUnit; diff --git a/solr/core/src/java/org/apache/solr/util/RTimerTree.java b/solr/core/src/java/org/apache/solr/util/RTimerTree.java index 9f75a2c7bba..e4d0021427b 100644 --- a/solr/core/src/java/org/apache/solr/util/RTimerTree.java +++ b/solr/core/src/java/org/apache/solr/util/RTimerTree.java @@ -1,5 +1,3 @@ -package org.apache.solr.util; - /* * 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.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; import java.util.Map; diff --git a/solr/core/src/java/org/apache/solr/util/RecordingJSONParser.java b/solr/core/src/java/org/apache/solr/util/RecordingJSONParser.java index 90be42c1f89..02ff03c11e1 100644 --- a/solr/core/src/java/org/apache/solr/util/RecordingJSONParser.java +++ b/solr/core/src/java/org/apache/solr/util/RecordingJSONParser.java @@ -1,5 +1,3 @@ -package org.apache.solr.util; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,7 +14,7 @@ package org.apache.solr.util; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.util; import java.io.IOException; import java.io.Reader; diff --git a/solr/core/src/java/org/apache/solr/util/RefCounted.java b/solr/core/src/java/org/apache/solr/util/RefCounted.java index f06228a7c80..15fcfe2fcf3 100644 --- a/solr/core/src/java/org/apache/solr/util/RefCounted.java +++ b/solr/core/src/java/org/apache/solr/util/RefCounted.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.util; import java.util.concurrent.atomic.AtomicInteger; diff --git a/solr/core/src/java/org/apache/solr/util/RegexFileFilter.java b/solr/core/src/java/org/apache/solr/util/RegexFileFilter.java index 927ea48611e..dcdc8b30cae 100644 --- a/solr/core/src/java/org/apache/solr/util/RegexFileFilter.java +++ b/solr/core/src/java/org/apache/solr/util/RegexFileFilter.java @@ -1,5 +1,3 @@ -package org.apache.solr.util; - /* * 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.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; import java.io.File; import java.io.FileFilter; diff --git a/solr/core/src/java/org/apache/solr/util/SimplePostTool.java b/solr/core/src/java/org/apache/solr/util/SimplePostTool.java index f12709eee98..448897a1388 100644 --- a/solr/core/src/java/org/apache/solr/util/SimplePostTool.java +++ b/solr/core/src/java/org/apache/solr/util/SimplePostTool.java @@ -1,5 +1,3 @@ -package org.apache.solr.util; - /* * 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.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; import javax.xml.bind.DatatypeConverter; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/solr/core/src/java/org/apache/solr/util/SolrCLI.java b/solr/core/src/java/org/apache/solr/util/SolrCLI.java index ac3c4216ca1..19aa52ac184 100644 --- a/solr/core/src/java/org/apache/solr/util/SolrCLI.java +++ b/solr/core/src/java/org/apache/solr/util/SolrCLI.java @@ -1,5 +1,3 @@ -package org.apache.solr.util; - /* * 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.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; import java.io.File; import java.io.FileNotFoundException; diff --git a/solr/core/src/java/org/apache/solr/util/SolrLogLayout.java b/solr/core/src/java/org/apache/solr/util/SolrLogLayout.java index 91407bdca44..8b1ca1fc800 100644 --- a/solr/core/src/java/org/apache/solr/util/SolrLogLayout.java +++ b/solr/core/src/java/org/apache/solr/util/SolrLogLayout.java @@ -1,3 +1,19 @@ +/* + * 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.util; import java.util.Collections; @@ -25,23 +41,6 @@ import static org.apache.solr.common.cloud.ZkStateReader.NODE_NAME_PROP; import static org.apache.solr.common.cloud.ZkStateReader.REPLICA_PROP; import static org.apache.solr.common.cloud.ZkStateReader.SHARD_ID_PROP; -/* - * 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. - */ - @SuppressForbidden(reason = "class is specific to log4j") public class SolrLogLayout extends Layout { /** diff --git a/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java b/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java index 8639dce0a94..9f9d1155af4 100644 --- a/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java +++ b/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.util; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/util/SpatialUtils.java b/solr/core/src/java/org/apache/solr/util/SpatialUtils.java index 24bbd4cf1c5..1b05d01f5e9 100644 --- a/solr/core/src/java/org/apache/solr/util/SpatialUtils.java +++ b/solr/core/src/java/org/apache/solr/util/SpatialUtils.java @@ -1,5 +1,3 @@ -package org.apache.solr.util; - /* * 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.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; import java.text.ParseException; diff --git a/solr/core/src/java/org/apache/solr/util/SystemIdResolver.java b/solr/core/src/java/org/apache/solr/util/SystemIdResolver.java index 503d40891ca..6fda14fdd50 100644 --- a/solr/core/src/java/org/apache/solr/util/SystemIdResolver.java +++ b/solr/core/src/java/org/apache/solr/util/SystemIdResolver.java @@ -1,5 +1,3 @@ -package org.apache.solr.util; - /* * 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.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/solr/core/src/java/org/apache/solr/util/TestInjection.java b/solr/core/src/java/org/apache/solr/util/TestInjection.java index 9861a1065a5..2fe2c00f688 100644 --- a/solr/core/src/java/org/apache/solr/util/TestInjection.java +++ b/solr/core/src/java/org/apache/solr/util/TestInjection.java @@ -1,5 +1,3 @@ -package org.apache.solr.util; - /* * 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.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; import java.util.Collections; import java.util.HashSet; diff --git a/solr/core/src/java/org/apache/solr/util/TimeOut.java b/solr/core/src/java/org/apache/solr/util/TimeOut.java index 30bef10b2c9..f823b7e3adf 100644 --- a/solr/core/src/java/org/apache/solr/util/TimeOut.java +++ b/solr/core/src/java/org/apache/solr/util/TimeOut.java @@ -1,5 +1,3 @@ -package org.apache.solr.util; - /* * 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.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; import java.util.concurrent.TimeUnit; diff --git a/solr/core/src/java/org/apache/solr/util/TimeZoneUtils.java b/solr/core/src/java/org/apache/solr/util/TimeZoneUtils.java index d57be19d2b8..9d11f81f03e 100644 --- a/solr/core/src/java/org/apache/solr/util/TimeZoneUtils.java +++ b/solr/core/src/java/org/apache/solr/util/TimeZoneUtils.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.util; import java.util.TimeZone; diff --git a/solr/core/src/java/org/apache/solr/util/VersionedFile.java b/solr/core/src/java/org/apache/solr/util/VersionedFile.java index d2342411aea..45aaef9bc71 100644 --- a/solr/core/src/java/org/apache/solr/util/VersionedFile.java +++ b/solr/core/src/java/org/apache/solr/util/VersionedFile.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.util; import java.io.File; diff --git a/solr/core/src/java/org/apache/solr/util/hll/BigEndianAscendingWordDeserializer.java b/solr/core/src/java/org/apache/solr/util/hll/BigEndianAscendingWordDeserializer.java index 559ec86097f..2555980264e 100644 --- a/solr/core/src/java/org/apache/solr/util/hll/BigEndianAscendingWordDeserializer.java +++ b/solr/core/src/java/org/apache/solr/util/hll/BigEndianAscendingWordDeserializer.java @@ -1,5 +1,3 @@ -package org.apache.solr.util.hll; - /* * 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.util.hll; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util.hll; /** * A corresponding deserializer for {@link BigEndianAscendingWordSerializer}. diff --git a/solr/core/src/java/org/apache/solr/util/hll/BigEndianAscendingWordSerializer.java b/solr/core/src/java/org/apache/solr/util/hll/BigEndianAscendingWordSerializer.java index dd7d281effa..f0c4d35d6d3 100644 --- a/solr/core/src/java/org/apache/solr/util/hll/BigEndianAscendingWordSerializer.java +++ b/solr/core/src/java/org/apache/solr/util/hll/BigEndianAscendingWordSerializer.java @@ -1,5 +1,3 @@ -package org.apache.solr.util.hll; - /* * 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.util.hll; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util.hll; /** * A serializer that writes a sequence of fixed bit-width 'words' to a byte array. diff --git a/solr/core/src/java/org/apache/solr/util/hll/BitUtil.java b/solr/core/src/java/org/apache/solr/util/hll/BitUtil.java index 275d7a13b18..fc6e4539283 100644 --- a/solr/core/src/java/org/apache/solr/util/hll/BitUtil.java +++ b/solr/core/src/java/org/apache/solr/util/hll/BitUtil.java @@ -1,5 +1,3 @@ -package org.apache.solr.util.hll; - /* * 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.util.hll; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util.hll; /** * A collection of bit utilities. diff --git a/solr/core/src/java/org/apache/solr/util/hll/BitVector.java b/solr/core/src/java/org/apache/solr/util/hll/BitVector.java index cd18570f52e..2545e43432a 100644 --- a/solr/core/src/java/org/apache/solr/util/hll/BitVector.java +++ b/solr/core/src/java/org/apache/solr/util/hll/BitVector.java @@ -1,5 +1,3 @@ -package org.apache.solr.util.hll; - /* * 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.util.hll; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util.hll; /** * A vector (array) of bits that is accessed in units ("registers") of width diff --git a/solr/core/src/java/org/apache/solr/util/hll/HLL.java b/solr/core/src/java/org/apache/solr/util/hll/HLL.java index 39ba80b37e0..6bcaee46987 100644 --- a/solr/core/src/java/org/apache/solr/util/hll/HLL.java +++ b/solr/core/src/java/org/apache/solr/util/hll/HLL.java @@ -1,5 +1,3 @@ -package org.apache.solr.util.hll; - /* * 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.util.hll; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util.hll; import java.util.Arrays; diff --git a/solr/core/src/java/org/apache/solr/util/hll/HLLMetadata.java b/solr/core/src/java/org/apache/solr/util/hll/HLLMetadata.java index 1e4e4ada895..417d868bb84 100644 --- a/solr/core/src/java/org/apache/solr/util/hll/HLLMetadata.java +++ b/solr/core/src/java/org/apache/solr/util/hll/HLLMetadata.java @@ -1,5 +1,3 @@ -package org.apache.solr.util.hll; - /* * 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.util.hll; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util.hll; /** * A concrete {@link IHLLMetadata} implemented as a simple struct. diff --git a/solr/core/src/java/org/apache/solr/util/hll/HLLType.java b/solr/core/src/java/org/apache/solr/util/hll/HLLType.java index e08fb14bf2d..8bff9a8784a 100644 --- a/solr/core/src/java/org/apache/solr/util/hll/HLLType.java +++ b/solr/core/src/java/org/apache/solr/util/hll/HLLType.java @@ -1,5 +1,3 @@ -package org.apache.solr.util.hll; - /* * 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.util.hll; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util.hll; /** * The types of algorithm/data structure that {@link HLL} can utilize. For more diff --git a/solr/core/src/java/org/apache/solr/util/hll/HLLUtil.java b/solr/core/src/java/org/apache/solr/util/hll/HLLUtil.java index 35aa86ea164..eb6ae2ed288 100644 --- a/solr/core/src/java/org/apache/solr/util/hll/HLLUtil.java +++ b/solr/core/src/java/org/apache/solr/util/hll/HLLUtil.java @@ -1,5 +1,3 @@ -package org.apache.solr.util.hll; - /* * 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.util.hll; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util.hll; /** * Static functions for computing constants and parameters used in the HLL diff --git a/solr/core/src/java/org/apache/solr/util/hll/IHLLMetadata.java b/solr/core/src/java/org/apache/solr/util/hll/IHLLMetadata.java index 79b294e8d63..648dee82611 100644 --- a/solr/core/src/java/org/apache/solr/util/hll/IHLLMetadata.java +++ b/solr/core/src/java/org/apache/solr/util/hll/IHLLMetadata.java @@ -1,5 +1,3 @@ -package org.apache.solr.util.hll; - /* * 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.util.hll; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util.hll; /** * The metadata and parameters associated with a HLL. diff --git a/solr/core/src/java/org/apache/solr/util/hll/ISchemaVersion.java b/solr/core/src/java/org/apache/solr/util/hll/ISchemaVersion.java index 26d8d02e7b6..fa615b2cdc2 100644 --- a/solr/core/src/java/org/apache/solr/util/hll/ISchemaVersion.java +++ b/solr/core/src/java/org/apache/solr/util/hll/ISchemaVersion.java @@ -1,5 +1,3 @@ -package org.apache.solr.util.hll; - /* * 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.util.hll; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util.hll; /** * A serialization schema for HLLs. Reads and writes HLL metadata to diff --git a/solr/core/src/java/org/apache/solr/util/hll/IWordDeserializer.java b/solr/core/src/java/org/apache/solr/util/hll/IWordDeserializer.java index 7e374259636..d1f1c72daa3 100644 --- a/solr/core/src/java/org/apache/solr/util/hll/IWordDeserializer.java +++ b/solr/core/src/java/org/apache/solr/util/hll/IWordDeserializer.java @@ -1,5 +1,3 @@ -package org.apache.solr.util.hll; - /* * 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.util.hll; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util.hll; /** * Reads 'words' of a fixed width, in sequence, from a byte array. diff --git a/solr/core/src/java/org/apache/solr/util/hll/IWordSerializer.java b/solr/core/src/java/org/apache/solr/util/hll/IWordSerializer.java index 10f75df8ef1..cd61de392df 100644 --- a/solr/core/src/java/org/apache/solr/util/hll/IWordSerializer.java +++ b/solr/core/src/java/org/apache/solr/util/hll/IWordSerializer.java @@ -1,5 +1,3 @@ -package org.apache.solr.util.hll; - /* * 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.util.hll; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util.hll; /** * Writes 'words' of fixed width, in sequence, to a byte array. diff --git a/solr/core/src/java/org/apache/solr/util/hll/LongIterator.java b/solr/core/src/java/org/apache/solr/util/hll/LongIterator.java index 4ad72b5c318..a584ccca814 100644 --- a/solr/core/src/java/org/apache/solr/util/hll/LongIterator.java +++ b/solr/core/src/java/org/apache/solr/util/hll/LongIterator.java @@ -1,5 +1,3 @@ -package org.apache.solr.util.hll; - /* * 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.util.hll; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util.hll; /** * A long-based iterator. This is not is-a {@link java.util.Iterator} diff --git a/solr/core/src/java/org/apache/solr/util/hll/NumberUtil.java b/solr/core/src/java/org/apache/solr/util/hll/NumberUtil.java index 1c5c1846d26..d5122cf9c8f 100644 --- a/solr/core/src/java/org/apache/solr/util/hll/NumberUtil.java +++ b/solr/core/src/java/org/apache/solr/util/hll/NumberUtil.java @@ -1,5 +1,3 @@ -package org.apache.solr.util.hll; - /* * 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.util.hll; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util.hll; /** * A collection of utilities to work with numbers. diff --git a/solr/core/src/java/org/apache/solr/util/hll/SchemaVersionOne.java b/solr/core/src/java/org/apache/solr/util/hll/SchemaVersionOne.java index e73c0cf1f7b..1927e04cdb0 100644 --- a/solr/core/src/java/org/apache/solr/util/hll/SchemaVersionOne.java +++ b/solr/core/src/java/org/apache/solr/util/hll/SchemaVersionOne.java @@ -1,5 +1,3 @@ -package org.apache.solr.util.hll; - /* * 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.util.hll; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util.hll; /** * A concrete {@link ISchemaVersion} representing schema version one. diff --git a/solr/core/src/java/org/apache/solr/util/hll/SerializationUtil.java b/solr/core/src/java/org/apache/solr/util/hll/SerializationUtil.java index bcf55a3ab50..39c7ad068ba 100644 --- a/solr/core/src/java/org/apache/solr/util/hll/SerializationUtil.java +++ b/solr/core/src/java/org/apache/solr/util/hll/SerializationUtil.java @@ -1,5 +1,3 @@ -package org.apache.solr.util.hll; - /* * 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.util.hll; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util.hll; /** * A collection of constants and utilities for serializing and deserializing diff --git a/solr/core/src/java/org/apache/solr/util/hll/package-info.java b/solr/core/src/java/org/apache/solr/util/hll/package-info.java index 040b84e7c5b..4a75a756eaf 100644 --- a/solr/core/src/java/org/apache/solr/util/hll/package-info.java +++ b/solr/core/src/java/org/apache/solr/util/hll/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * A fork of Java-HyperLogLog package tweaked * not to depend on fastutil and with cleanups to make it lean and clean. diff --git a/solr/core/src/java/org/apache/solr/util/package-info.java b/solr/core/src/java/org/apache/solr/util/package-info.java index fc6232bdc03..e5c9756b270 100644 --- a/solr/core/src/java/org/apache/solr/util/package-info.java +++ b/solr/core/src/java/org/apache/solr/util/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Common utility classes used throughout Solr */ diff --git a/solr/core/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java b/solr/core/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java index abf8ef9f021..d0b8785fff3 100644 --- a/solr/core/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java +++ b/solr/core/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.util.plugin; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/java/org/apache/solr/util/plugin/MapInitializedPlugin.java b/solr/core/src/java/org/apache/solr/util/plugin/MapInitializedPlugin.java index f7fbb60ae6e..d4b8f7c794b 100644 --- a/solr/core/src/java/org/apache/solr/util/plugin/MapInitializedPlugin.java +++ b/solr/core/src/java/org/apache/solr/util/plugin/MapInitializedPlugin.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.util.plugin; import java.util.Map; diff --git a/solr/core/src/java/org/apache/solr/util/plugin/MapPluginLoader.java b/solr/core/src/java/org/apache/solr/util/plugin/MapPluginLoader.java index 1c7eb48b4c7..fd65169bea4 100644 --- a/solr/core/src/java/org/apache/solr/util/plugin/MapPluginLoader.java +++ b/solr/core/src/java/org/apache/solr/util/plugin/MapPluginLoader.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.util.plugin; import java.util.Map; diff --git a/solr/core/src/java/org/apache/solr/util/plugin/NamedListInitializedPlugin.java b/solr/core/src/java/org/apache/solr/util/plugin/NamedListInitializedPlugin.java index 6945bba96ce..ce2a7c89125 100644 --- a/solr/core/src/java/org/apache/solr/util/plugin/NamedListInitializedPlugin.java +++ b/solr/core/src/java/org/apache/solr/util/plugin/NamedListInitializedPlugin.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.util.plugin; import org.apache.solr.common.util.NamedList; diff --git a/solr/core/src/java/org/apache/solr/util/plugin/NamedListPluginLoader.java b/solr/core/src/java/org/apache/solr/util/plugin/NamedListPluginLoader.java index e57c853d110..6ba5cf907a0 100644 --- a/solr/core/src/java/org/apache/solr/util/plugin/NamedListPluginLoader.java +++ b/solr/core/src/java/org/apache/solr/util/plugin/NamedListPluginLoader.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.util.plugin; import java.util.Map; diff --git a/solr/core/src/java/org/apache/solr/util/plugin/SolrCoreAware.java b/solr/core/src/java/org/apache/solr/util/plugin/SolrCoreAware.java index 8439717716a..f098635958b 100644 --- a/solr/core/src/java/org/apache/solr/util/plugin/SolrCoreAware.java +++ b/solr/core/src/java/org/apache/solr/util/plugin/SolrCoreAware.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.util.plugin; import org.apache.solr.core.SolrCore; diff --git a/solr/core/src/java/org/apache/solr/util/plugin/package-info.java b/solr/core/src/java/org/apache/solr/util/plugin/package-info.java index e0e3a435972..b202fbf272d 100644 --- a/solr/core/src/java/org/apache/solr/util/plugin/package-info.java +++ b/solr/core/src/java/org/apache/solr/util/plugin/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Common APIs related to implementing Solr plugins *

    diff --git a/solr/core/src/java/org/apache/solr/util/stats/Clock.java b/solr/core/src/java/org/apache/solr/util/stats/Clock.java index 0fef68cf934..a94c216082e 100644 --- a/solr/core/src/java/org/apache/solr/util/stats/Clock.java +++ b/solr/core/src/java/org/apache/solr/util/stats/Clock.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /* * Forked from https://github.com/codahale/metrics */ diff --git a/solr/core/src/java/org/apache/solr/util/stats/EWMA.java b/solr/core/src/java/org/apache/solr/util/stats/EWMA.java index 4e8ee41760a..010d2b1c5a8 100644 --- a/solr/core/src/java/org/apache/solr/util/stats/EWMA.java +++ b/solr/core/src/java/org/apache/solr/util/stats/EWMA.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /* * Forked from https://github.com/codahale/metrics */ diff --git a/solr/core/src/java/org/apache/solr/util/stats/ExponentiallyDecayingSample.java b/solr/core/src/java/org/apache/solr/util/stats/ExponentiallyDecayingSample.java index 6a227ec8c38..92b72fdecce 100644 --- a/solr/core/src/java/org/apache/solr/util/stats/ExponentiallyDecayingSample.java +++ b/solr/core/src/java/org/apache/solr/util/stats/ExponentiallyDecayingSample.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /* * Forked from https://github.com/codahale/metrics */ diff --git a/solr/core/src/java/org/apache/solr/util/stats/Histogram.java b/solr/core/src/java/org/apache/solr/util/stats/Histogram.java index 07d3b1f37a0..eef8f35d4a5 100644 --- a/solr/core/src/java/org/apache/solr/util/stats/Histogram.java +++ b/solr/core/src/java/org/apache/solr/util/stats/Histogram.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /* * Forked from https://github.com/codahale/metrics */ diff --git a/solr/core/src/java/org/apache/solr/util/stats/Meter.java b/solr/core/src/java/org/apache/solr/util/stats/Meter.java index d362393deab..8847fc435e7 100644 --- a/solr/core/src/java/org/apache/solr/util/stats/Meter.java +++ b/solr/core/src/java/org/apache/solr/util/stats/Meter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /* * Forked from https://github.com/codahale/metrics */ diff --git a/solr/core/src/java/org/apache/solr/util/stats/Sample.java b/solr/core/src/java/org/apache/solr/util/stats/Sample.java index 0ec8d4bd0a8..29c69f4f4ed 100644 --- a/solr/core/src/java/org/apache/solr/util/stats/Sample.java +++ b/solr/core/src/java/org/apache/solr/util/stats/Sample.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /* * Forked from https://github.com/codahale/metrics */ diff --git a/solr/core/src/java/org/apache/solr/util/stats/Snapshot.java b/solr/core/src/java/org/apache/solr/util/stats/Snapshot.java index b04d40e7963..78524bf5188 100644 --- a/solr/core/src/java/org/apache/solr/util/stats/Snapshot.java +++ b/solr/core/src/java/org/apache/solr/util/stats/Snapshot.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /* * Forked from https://github.com/codahale/metrics */ diff --git a/solr/core/src/java/org/apache/solr/util/stats/Timer.java b/solr/core/src/java/org/apache/solr/util/stats/Timer.java index 623ee748af4..de5790ca401 100644 --- a/solr/core/src/java/org/apache/solr/util/stats/Timer.java +++ b/solr/core/src/java/org/apache/solr/util/stats/Timer.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /* * Forked from https://github.com/codahale/metrics */ diff --git a/solr/core/src/java/org/apache/solr/util/stats/TimerContext.java b/solr/core/src/java/org/apache/solr/util/stats/TimerContext.java index 844e934938c..125b9821047 100644 --- a/solr/core/src/java/org/apache/solr/util/stats/TimerContext.java +++ b/solr/core/src/java/org/apache/solr/util/stats/TimerContext.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /* * Forked from https://github.com/codahale/metrics */ diff --git a/solr/core/src/java/org/apache/solr/util/stats/UniformSample.java b/solr/core/src/java/org/apache/solr/util/stats/UniformSample.java index 0293d69cfa2..81c8ed1ac20 100644 --- a/solr/core/src/java/org/apache/solr/util/stats/UniformSample.java +++ b/solr/core/src/java/org/apache/solr/util/stats/UniformSample.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /* * Forked from https://github.com/codahale/metrics */ diff --git a/solr/core/src/java/org/apache/solr/util/stats/package-info.java b/solr/core/src/java/org/apache/solr/util/stats/package-info.java index 5b55c70296e..78761af430c 100644 --- a/solr/core/src/java/org/apache/solr/util/stats/package-info.java +++ b/solr/core/src/java/org/apache/solr/util/stats/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Utilities for collecting statistics */ diff --git a/solr/core/src/java/org/apache/solr/util/xslt/TransformerProvider.java b/solr/core/src/java/org/apache/solr/util/xslt/TransformerProvider.java index 8d83e623e06..d09610c63f1 100644 --- a/solr/core/src/java/org/apache/solr/util/xslt/TransformerProvider.java +++ b/solr/core/src/java/org/apache/solr/util/xslt/TransformerProvider.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.util.xslt; import java.io.IOException; diff --git a/solr/core/src/java/org/apache/solr/util/xslt/package-info.java b/solr/core/src/java/org/apache/solr/util/xslt/package-info.java index 488386cfa75..d859ec87b65 100644 --- a/solr/core/src/java/org/apache/solr/util/xslt/package-info.java +++ b/solr/core/src/java/org/apache/solr/util/xslt/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * XSLT related utilities (deprecated package, do not add new classes) */ diff --git a/solr/core/src/test-files/runtimecode/RuntimeLibReqHandler.java b/solr/core/src/test-files/runtimecode/RuntimeLibReqHandler.java index a8bc677be19..b089ae5ff8a 100644 --- a/solr/core/src/test-files/runtimecode/RuntimeLibReqHandler.java +++ b/solr/core/src/test-files/runtimecode/RuntimeLibReqHandler.java @@ -1,5 +1,3 @@ -package runtimecode; - /* * 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 runtimecode; * See the License for the specific language governing permissions and * limitations under the License. */ +package runtimecode; import java.io.IOException; @@ -23,7 +22,6 @@ import org.apache.solr.handler.DumpRequestHandler; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.response.SolrQueryResponse; - public class RuntimeLibReqHandler extends DumpRequestHandler { @Override public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throws IOException { diff --git a/solr/core/src/test-files/runtimecode/RuntimeLibResponseWriter.java b/solr/core/src/test-files/runtimecode/RuntimeLibResponseWriter.java index 19a4880d47b..e159d20bba5 100644 --- a/solr/core/src/test-files/runtimecode/RuntimeLibResponseWriter.java +++ b/solr/core/src/test-files/runtimecode/RuntimeLibResponseWriter.java @@ -1,5 +1,3 @@ -package runtimecode; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,7 +14,23 @@ package runtimecode; * See the License for the specific language governing permissions and * limitations under the License. */ +package runtimecode; +/* + * 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. + */ import java.io.IOException; import java.io.Writer; diff --git a/solr/core/src/test-files/runtimecode/RuntimeLibSearchComponent.java b/solr/core/src/test-files/runtimecode/RuntimeLibSearchComponent.java index 7bbcb022205..bbf25194a98 100644 --- a/solr/core/src/test-files/runtimecode/RuntimeLibSearchComponent.java +++ b/solr/core/src/test-files/runtimecode/RuntimeLibSearchComponent.java @@ -1,5 +1,3 @@ -package runtimecode; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,7 +14,7 @@ package runtimecode; * See the License for the specific language governing permissions and * limitations under the License. */ - +package runtimecode; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/AnalysisAfterCoreReloadTest.java b/solr/core/src/test/org/apache/solr/AnalysisAfterCoreReloadTest.java index 09fb5008d15..4941bd12186 100644 --- a/solr/core/src/test/org/apache/solr/AnalysisAfterCoreReloadTest.java +++ b/solr/core/src/test/org/apache/solr/AnalysisAfterCoreReloadTest.java @@ -1,5 +1,3 @@ -package org.apache.solr; - /* * 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; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr; import org.apache.commons.io.FileUtils; import org.apache.solr.client.solrj.SolrClient; diff --git a/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java b/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java index 293b5ca0018..25ea2c53beb 100644 --- a/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java +++ b/solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr; import java.io.ByteArrayInputStream; diff --git a/solr/core/src/test/org/apache/solr/ConvertedLegacyTest.java b/solr/core/src/test/org/apache/solr/ConvertedLegacyTest.java index e9482128186..767b811964d 100644 --- a/solr/core/src/test/org/apache/solr/ConvertedLegacyTest.java +++ b/solr/core/src/test/org/apache/solr/ConvertedLegacyTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr; import org.apache.solr.common.params.CommonParams; diff --git a/solr/core/src/test/org/apache/solr/CursorPagingTest.java b/solr/core/src/test/org/apache/solr/CursorPagingTest.java index 9154f3633c0..b204677f8c5 100644 --- a/solr/core/src/test/org/apache/solr/CursorPagingTest.java +++ b/solr/core/src/test/org/apache/solr/CursorPagingTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr; import org.apache.lucene.util.TestUtil; diff --git a/solr/core/src/test/org/apache/solr/DisMaxRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/DisMaxRequestHandlerTest.java index 2bbb5114c90..8d1b758c87c 100644 --- a/solr/core/src/test/org/apache/solr/DisMaxRequestHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/DisMaxRequestHandlerTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr; import org.apache.solr.common.params.CommonParams; diff --git a/solr/core/src/test/org/apache/solr/DistributedIntervalFacetingTest.java b/solr/core/src/test/org/apache/solr/DistributedIntervalFacetingTest.java index 68d1ace223e..9e69e307042 100644 --- a/solr/core/src/test/org/apache/solr/DistributedIntervalFacetingTest.java +++ b/solr/core/src/test/org/apache/solr/DistributedIntervalFacetingTest.java @@ -1,17 +1,3 @@ -package org.apache.solr; - -import java.util.Arrays; -import java.util.Comparator; -import java.util.List; - -import org.apache.lucene.util.LuceneTestCase.Slow; -import org.apache.solr.client.solrj.SolrQuery; -import org.apache.solr.client.solrj.response.IntervalFacet.Count; -import org.apache.solr.client.solrj.response.QueryResponse; -import org.apache.solr.common.params.ModifiableSolrParams; -import org.junit.BeforeClass; -import org.junit.Test; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -28,6 +14,20 @@ import org.junit.Test; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr; + +import java.util.Arrays; +import java.util.Comparator; +import java.util.List; + +import org.apache.lucene.util.LuceneTestCase.Slow; +import org.apache.solr.client.solrj.SolrQuery; +import org.apache.solr.client.solrj.response.IntervalFacet.Count; +import org.apache.solr.client.solrj.response.QueryResponse; +import org.apache.solr.common.params.ModifiableSolrParams; +import org.junit.BeforeClass; +import org.junit.Test; + @Slow public class DistributedIntervalFacetingTest extends BaseDistributedSearchTestCase { diff --git a/solr/core/src/test/org/apache/solr/EchoParamsTest.java b/solr/core/src/test/org/apache/solr/EchoParamsTest.java index d41ab5d6aa7..a89a5125aa4 100644 --- a/solr/core/src/test/org/apache/solr/EchoParamsTest.java +++ b/solr/core/src/test/org/apache/solr/EchoParamsTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr; import org.apache.solr.common.params.CommonParams; diff --git a/solr/core/src/test/org/apache/solr/MinimalSchemaTest.java b/solr/core/src/test/org/apache/solr/MinimalSchemaTest.java index 52d47f4af8b..1ee3269fc2c 100644 --- a/solr/core/src/test/org/apache/solr/MinimalSchemaTest.java +++ b/solr/core/src/test/org/apache/solr/MinimalSchemaTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr; import org.apache.solr.common.params.CommonParams; diff --git a/solr/core/src/test/org/apache/solr/OutputWriterTest.java b/solr/core/src/test/org/apache/solr/OutputWriterTest.java index 26023758481..3df9459accc 100644 --- a/solr/core/src/test/org/apache/solr/OutputWriterTest.java +++ b/solr/core/src/test/org/apache/solr/OutputWriterTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/SampleTest.java b/solr/core/src/test/org/apache/solr/SampleTest.java index 8cfa17104f4..cea23ee59e9 100644 --- a/solr/core/src/test/org/apache/solr/SampleTest.java +++ b/solr/core/src/test/org/apache/solr/SampleTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr; import org.apache.solr.common.params.CommonParams; diff --git a/solr/core/src/test/org/apache/solr/SolrTestCaseJ4Test.java b/solr/core/src/test/org/apache/solr/SolrTestCaseJ4Test.java index 75f669388d4..795c3e8ff31 100644 --- a/solr/core/src/test/org/apache/solr/SolrTestCaseJ4Test.java +++ b/solr/core/src/test/org/apache/solr/SolrTestCaseJ4Test.java @@ -1,5 +1,3 @@ -package org.apache.solr; - /* * 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; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr; import java.io.File; diff --git a/solr/core/src/test/org/apache/solr/TestCrossCoreJoin.java b/solr/core/src/test/org/apache/solr/TestCrossCoreJoin.java index 2d9460f5f73..d15b3bc3e92 100644 --- a/solr/core/src/test/org/apache/solr/TestCrossCoreJoin.java +++ b/solr/core/src/test/org/apache/solr/TestCrossCoreJoin.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr; import java.io.StringWriter; diff --git a/solr/core/src/test/org/apache/solr/TestCursorMarkWithoutUniqueKey.java b/solr/core/src/test/org/apache/solr/TestCursorMarkWithoutUniqueKey.java index 963e37cc466..8eed87ea804 100644 --- a/solr/core/src/test/org/apache/solr/TestCursorMarkWithoutUniqueKey.java +++ b/solr/core/src/test/org/apache/solr/TestCursorMarkWithoutUniqueKey.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr; import org.apache.solr.schema.SchemaField; diff --git a/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java b/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java index bce93c012c2..5d19fd60506 100644 --- a/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java +++ b/solr/core/src/test/org/apache/solr/TestDistributedGrouping.java @@ -1,5 +1,3 @@ -package org.apache.solr; - /* * 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; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr; import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.solr.client.solrj.SolrClient; diff --git a/solr/core/src/test/org/apache/solr/TestDistributedMissingSort.java b/solr/core/src/test/org/apache/solr/TestDistributedMissingSort.java index f877c543a90..7a91c83afa6 100644 --- a/solr/core/src/test/org/apache/solr/TestDistributedMissingSort.java +++ b/solr/core/src/test/org/apache/solr/TestDistributedMissingSort.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr; import org.apache.lucene.util.LuceneTestCase.Slow; diff --git a/solr/core/src/test/org/apache/solr/TestDistributedSearch.java b/solr/core/src/test/org/apache/solr/TestDistributedSearch.java index ae60ede7aa2..7e0751410a9 100644 --- a/solr/core/src/test/org/apache/solr/TestDistributedSearch.java +++ b/solr/core/src/test/org/apache/solr/TestDistributedSearch.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/TestDocumentBuilder.java b/solr/core/src/test/org/apache/solr/TestDocumentBuilder.java index d47b48de5c7..df8ef006f6e 100644 --- a/solr/core/src/test/org/apache/solr/TestDocumentBuilder.java +++ b/solr/core/src/test/org/apache/solr/TestDocumentBuilder.java @@ -1,5 +1,3 @@ -package org.apache.solr; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,7 +14,7 @@ package org.apache.solr; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr; import java.io.IOException; import java.util.ArrayList; diff --git a/solr/core/src/test/org/apache/solr/TestGroupingSearch.java b/solr/core/src/test/org/apache/solr/TestGroupingSearch.java index 8929c580caa..c85782f9f0b 100644 --- a/solr/core/src/test/org/apache/solr/TestGroupingSearch.java +++ b/solr/core/src/test/org/apache/solr/TestGroupingSearch.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr; import java.io.ByteArrayInputStream; diff --git a/solr/core/src/test/org/apache/solr/TestHighlightDedupGrouping.java b/solr/core/src/test/org/apache/solr/TestHighlightDedupGrouping.java index 3d1ec6bace8..d3f37960b35 100644 --- a/solr/core/src/test/org/apache/solr/TestHighlightDedupGrouping.java +++ b/solr/core/src/test/org/apache/solr/TestHighlightDedupGrouping.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr; import org.apache.lucene.util.TestUtil; diff --git a/solr/core/src/test/org/apache/solr/TestJoin.java b/solr/core/src/test/org/apache/solr/TestJoin.java index 9e439420304..419275c5891 100644 --- a/solr/core/src/test/org/apache/solr/TestJoin.java +++ b/solr/core/src/test/org/apache/solr/TestJoin.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr; import org.apache.solr.common.params.ModifiableSolrParams; diff --git a/solr/core/src/test/org/apache/solr/TestRandomDVFaceting.java b/solr/core/src/test/org/apache/solr/TestRandomDVFaceting.java index 3ccf58bfcb6..8ac0bcc4ed1 100644 --- a/solr/core/src/test/org/apache/solr/TestRandomDVFaceting.java +++ b/solr/core/src/test/org/apache/solr/TestRandomDVFaceting.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/test/org/apache/solr/TestRandomFaceting.java b/solr/core/src/test/org/apache/solr/TestRandomFaceting.java index d408b92928b..daafca1e6b2 100644 --- a/solr/core/src/test/org/apache/solr/TestRandomFaceting.java +++ b/solr/core/src/test/org/apache/solr/TestRandomFaceting.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr; import org.apache.lucene.util.TestUtil; diff --git a/solr/core/src/test/org/apache/solr/TestSimpleTrackingShardHandler.java b/solr/core/src/test/org/apache/solr/TestSimpleTrackingShardHandler.java index d2d43ee1252..059ec6a4e18 100644 --- a/solr/core/src/test/org/apache/solr/TestSimpleTrackingShardHandler.java +++ b/solr/core/src/test/org/apache/solr/TestSimpleTrackingShardHandler.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr; import org.apache.solr.client.solrj.response.QueryResponse; diff --git a/solr/core/src/test/org/apache/solr/TestTolerantSearch.java b/solr/core/src/test/org/apache/solr/TestTolerantSearch.java index a6c692132dc..1d7dd2be66c 100644 --- a/solr/core/src/test/org/apache/solr/TestTolerantSearch.java +++ b/solr/core/src/test/org/apache/solr/TestTolerantSearch.java @@ -1,3 +1,19 @@ +/* + * 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; import org.apache.commons.io.FileUtils; @@ -21,23 +37,6 @@ import java.io.File; import java.io.IOException; import java.io.OutputStream; -/* - * 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 TestTolerantSearch extends SolrJettyTestBase { private static SolrClient collection1; diff --git a/solr/core/src/test/org/apache/solr/analysis/PathHierarchyTokenizerFactoryTest.java b/solr/core/src/test/org/apache/solr/analysis/PathHierarchyTokenizerFactoryTest.java index bd98a620d24..1a8cef58860 100644 --- a/solr/core/src/test/org/apache/solr/analysis/PathHierarchyTokenizerFactoryTest.java +++ b/solr/core/src/test/org/apache/solr/analysis/PathHierarchyTokenizerFactoryTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.analysis; import java.util.HashMap; diff --git a/solr/core/src/test/org/apache/solr/analysis/TestCharFilters.java b/solr/core/src/test/org/apache/solr/analysis/TestCharFilters.java index 1e15c179281..984ad125f41 100644 --- a/solr/core/src/test/org/apache/solr/analysis/TestCharFilters.java +++ b/solr/core/src/test/org/apache/solr/analysis/TestCharFilters.java @@ -1,5 +1,3 @@ -package org.apache.solr.analysis; - /* * 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.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.analysis; import org.apache.solr.SolrTestCaseJ4; import org.junit.BeforeClass; diff --git a/solr/core/src/test/org/apache/solr/analysis/TestReversedWildcardFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestReversedWildcardFilterFactory.java index e7ea88ed324..289a75f9a5a 100644 --- a/solr/core/src/test/org/apache/solr/analysis/TestReversedWildcardFilterFactory.java +++ b/solr/core/src/test/org/apache/solr/analysis/TestReversedWildcardFilterFactory.java @@ -1,4 +1,3 @@ -package org.apache.solr.analysis; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.analysis; import java.io.IOException; import java.util.HashMap; import java.util.Map; diff --git a/solr/core/src/test/org/apache/solr/analysis/TestWordDelimiterFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/TestWordDelimiterFilterFactory.java index fc9aec19304..2becb665d27 100644 --- a/solr/core/src/test/org/apache/solr/analysis/TestWordDelimiterFilterFactory.java +++ b/solr/core/src/test/org/apache/solr/analysis/TestWordDelimiterFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.analysis; - /* * 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.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.analysis; import java.util.HashMap; import java.util.Map; diff --git a/solr/core/src/test/org/apache/solr/analysis/ThrowingMockTokenFilterFactory.java b/solr/core/src/test/org/apache/solr/analysis/ThrowingMockTokenFilterFactory.java index ee6e893fd6f..47f80edc5e6 100644 --- a/solr/core/src/test/org/apache/solr/analysis/ThrowingMockTokenFilterFactory.java +++ b/solr/core/src/test/org/apache/solr/analysis/ThrowingMockTokenFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.analysis; - /* * 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.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.analysis; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; diff --git a/solr/core/src/test/org/apache/solr/client/solrj/ConnectionReuseTest.java b/solr/core/src/test/org/apache/solr/client/solrj/ConnectionReuseTest.java index 352010c6b13..0ec9876b61f 100644 --- a/solr/core/src/test/org/apache/solr/client/solrj/ConnectionReuseTest.java +++ b/solr/core/src/test/org/apache/solr/client/solrj/ConnectionReuseTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj; - /* * 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; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj; import java.io.IOException; import java.net.URL; diff --git a/solr/core/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServerConstructors.java b/solr/core/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServerConstructors.java index 59fd6afbe89..0ce83d89aa8 100644 --- a/solr/core/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServerConstructors.java +++ b/solr/core/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServerConstructors.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.embedded; - /* * 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.embedded; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.embedded; import java.io.IOException; import java.nio.file.Path; diff --git a/solr/core/src/test/org/apache/solr/client/solrj/embedded/TestJettySolrRunner.java b/solr/core/src/test/org/apache/solr/client/solrj/embedded/TestJettySolrRunner.java index d1ac4fde723..17facec7241 100644 --- a/solr/core/src/test/org/apache/solr/client/solrj/embedded/TestJettySolrRunner.java +++ b/solr/core/src/test/org/apache/solr/client/solrj/embedded/TestJettySolrRunner.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.embedded; - /* * 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.embedded; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.embedded; import com.google.common.base.Charsets; import org.apache.solr.SolrTestCaseJ4; diff --git a/solr/core/src/test/org/apache/solr/cloud/ActionThrottleTest.java b/solr/core/src/test/org/apache/solr/cloud/ActionThrottleTest.java index f125f940647..ca256d34f12 100644 --- a/solr/core/src/test/org/apache/solr/cloud/ActionThrottleTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/ActionThrottleTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.util.Arrays; import java.util.List; diff --git a/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java b/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java index 77fbd7405b2..a270a108141 100644 --- a/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/AliasIntegrationTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.solr.client.solrj.SolrClient; diff --git a/solr/core/src/test/org/apache/solr/cloud/AssignTest.java b/solr/core/src/test/org/apache/solr/cloud/AssignTest.java index 2a8402df5db..6069650e1b7 100644 --- a/solr/core/src/test/org/apache/solr/cloud/AssignTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/AssignTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.util.HashMap; import java.util.HashSet; diff --git a/solr/core/src/test/org/apache/solr/cloud/AsyncCallRequestStatusResponseTest.java b/solr/core/src/test/org/apache/solr/cloud/AsyncCallRequestStatusResponseTest.java index b090a67030d..da73acc2d95 100644 --- a/solr/core/src/test/org/apache/solr/cloud/AsyncCallRequestStatusResponseTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/AsyncCallRequestStatusResponseTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.solr.client.solrj.request.CollectionAdminRequest; import org.apache.solr.client.solrj.response.CollectionAdminResponse; diff --git a/solr/core/src/test/org/apache/solr/cloud/AsyncMigrateRouteKeyTest.java b/solr/core/src/test/org/apache/solr/cloud/AsyncMigrateRouteKeyTest.java index ba1364dc1e9..b9e6d3a090d 100644 --- a/solr/core/src/test/org/apache/solr/cloud/AsyncMigrateRouteKeyTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/AsyncMigrateRouteKeyTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.solr.client.solrj.SolrRequest; import org.apache.solr.client.solrj.SolrServerException; diff --git a/solr/core/src/test/org/apache/solr/cloud/BaseCdcrDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/BaseCdcrDistributedZkTest.java index 8af11fe6fb1..68a09e2e16b 100644 --- a/solr/core/src/test/org/apache/solr/cloud/BaseCdcrDistributedZkTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/BaseCdcrDistributedZkTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.io.File; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java index 770eba7413b..a0425014631 100644 --- a/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.java +++ b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZk2Test.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.io.IOException; import java.nio.file.DirectoryStream; diff --git a/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java index 7886e4f9d0b..87604fcaa9b 100644 --- a/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/BasicDistributedZkTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.commons.lang.StringUtils; import org.apache.lucene.util.IOUtils; diff --git a/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java b/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java index 9eb14ef7d60..26fa3257398 100644 --- a/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/BasicZkTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.solr.common.SolrException; diff --git a/solr/core/src/test/org/apache/solr/cloud/CdcrReplicationDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/CdcrReplicationDistributedZkTest.java index 413cd0dbec2..3478df962fb 100644 --- a/solr/core/src/test/org/apache/solr/cloud/CdcrReplicationDistributedZkTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/CdcrReplicationDistributedZkTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.lucene.util.LuceneTestCase.Nightly; import org.apache.solr.common.SolrInputDocument; diff --git a/solr/core/src/test/org/apache/solr/cloud/CdcrReplicationHandlerTest.java b/solr/core/src/test/org/apache/solr/cloud/CdcrReplicationHandlerTest.java index b7b09a66869..1663949973c 100644 --- a/solr/core/src/test/org/apache/solr/cloud/CdcrReplicationHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/CdcrReplicationHandlerTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.lucene.util.LuceneTestCase.Nightly; import org.apache.solr.client.solrj.SolrClient; diff --git a/solr/core/src/test/org/apache/solr/cloud/CdcrRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/cloud/CdcrRequestHandlerTest.java index 666bfd1f8c5..c74079cc62a 100644 --- a/solr/core/src/test/org/apache/solr/cloud/CdcrRequestHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/CdcrRequestHandlerTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.lucene.util.LuceneTestCase.Nightly; import org.apache.solr.common.util.NamedList; diff --git a/solr/core/src/test/org/apache/solr/cloud/CdcrVersionReplicationTest.java b/solr/core/src/test/org/apache/solr/cloud/CdcrVersionReplicationTest.java index 1a11f0d2c2a..367bbafc9ef 100644 --- a/solr/core/src/test/org/apache/solr/cloud/CdcrVersionReplicationTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/CdcrVersionReplicationTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.SolrServerException; diff --git a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java index cda749f80d2..9584838f10d 100644 --- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyNothingIsSafeTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering; import org.apache.http.impl.client.CloseableHttpClient; diff --git a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java index 314f581aa68..679f2bb9237 100644 --- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeySafeLeaderTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.solr.client.solrj.SolrQuery; diff --git a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyShardSplitTest.java b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyShardSplitTest.java index c986a33b985..7a44561d38b 100644 --- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyShardSplitTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyShardSplitTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.solr.client.solrj.SolrClient; diff --git a/solr/core/src/test/org/apache/solr/cloud/CleanupOldIndexTest.java b/solr/core/src/test/org/apache/solr/cloud/CleanupOldIndexTest.java index b7c1997970a..610bb54b2cb 100644 --- a/solr/core/src/test/org/apache/solr/cloud/CleanupOldIndexTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/CleanupOldIndexTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.io.File; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/cloud/CloudExitableDirectoryReaderTest.java b/solr/core/src/test/org/apache/solr/cloud/CloudExitableDirectoryReaderTest.java index 677a12a8c1f..ec84c06ce2b 100644 --- a/solr/core/src/test/org/apache/solr/cloud/CloudExitableDirectoryReaderTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/CloudExitableDirectoryReaderTest.java @@ -1,22 +1,20 @@ -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 -* 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. -*/ - + * 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 org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.lucene.util.TestUtil; diff --git a/solr/core/src/test/org/apache/solr/cloud/ClusterStateTest.java b/solr/core/src/test/org/apache/solr/cloud/ClusterStateTest.java index 81b2cbe66b7..d0005afd58d 100644 --- a/solr/core/src/test/org/apache/solr/cloud/ClusterStateTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/ClusterStateTest.java @@ -1,21 +1,20 @@ -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 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 - * + * 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. + * 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 java.util.HashMap; import java.util.HashSet; diff --git a/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.java b/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.java index 5740a5de49d..1e3c303e8c1 100644 --- a/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/ClusterStateUpdateTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.io.File; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/cloud/CollectionReloadTest.java b/solr/core/src/test/org/apache/solr/cloud/CollectionReloadTest.java index c96b272cc53..b6eb5e2a494 100644 --- a/solr/core/src/test/org/apache/solr/cloud/CollectionReloadTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/CollectionReloadTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/test/org/apache/solr/cloud/CollectionStateFormat2Test.java b/solr/core/src/test/org/apache/solr/cloud/CollectionStateFormat2Test.java index 9992689c2d4..3a83e476b62 100644 --- a/solr/core/src/test/org/apache/solr/cloud/CollectionStateFormat2Test.java +++ b/solr/core/src/test/org/apache/solr/cloud/CollectionStateFormat2Test.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.solr.client.solrj.impl.CloudSolrClient; import org.apache.solr.client.solrj.request.QueryRequest; diff --git a/solr/core/src/test/org/apache/solr/cloud/CollectionTooManyReplicasTest.java b/solr/core/src/test/org/apache/solr/cloud/CollectionTooManyReplicasTest.java index f84a72fe015..92fea45e335 100644 --- a/solr/core/src/test/org/apache/solr/cloud/CollectionTooManyReplicasTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/CollectionTooManyReplicasTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.util.ArrayList; import java.util.List; diff --git a/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIAsyncDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIAsyncDistributedZkTest.java index 621c1ff95b3..493b2988853 100644 --- a/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIAsyncDistributedZkTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIAsyncDistributedZkTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.util.ArrayList; import java.util.List; diff --git a/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java index f008d721b4f..1ce4f62788b 100644 --- a/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import javax.management.MBeanServer; import javax.management.MBeanServerFactory; diff --git a/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTests.java b/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTests.java index dda78c2ef32..557d8782c33 100644 --- a/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTests.java +++ b/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTests.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.io.File; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/cloud/ConcurrentDeleteAndCreateCollectionTest.java b/solr/core/src/test/org/apache/solr/cloud/ConcurrentDeleteAndCreateCollectionTest.java index 83453a75a62..82bf9d4a4aa 100644 --- a/solr/core/src/test/org/apache/solr/cloud/ConcurrentDeleteAndCreateCollectionTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/ConcurrentDeleteAndCreateCollectionTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.io.File; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/cloud/ConfigSetsAPITest.java b/solr/core/src/test/org/apache/solr/cloud/ConfigSetsAPITest.java index b31e9a0b00e..8e131031536 100644 --- a/solr/core/src/test/org/apache/solr/cloud/ConfigSetsAPITest.java +++ b/solr/core/src/test/org/apache/solr/cloud/ConfigSetsAPITest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.lucene.util.LuceneTestCase; import org.apache.solr.client.solrj.request.CollectionAdminRequest; diff --git a/solr/core/src/test/org/apache/solr/cloud/ConnectionManagerTest.java b/solr/core/src/test/org/apache/solr/cloud/ConnectionManagerTest.java index 0c568a9f42e..15baaca2299 100644 --- a/solr/core/src/test/org/apache/solr/cloud/ConnectionManagerTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/ConnectionManagerTest.java @@ -1,21 +1,20 @@ -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 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 - * + * 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. + * 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 org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.solr.SolrTestCaseJ4; diff --git a/solr/core/src/test/org/apache/solr/cloud/CustomCollectionTest.java b/solr/core/src/test/org/apache/solr/cloud/CustomCollectionTest.java index e4c638f70b7..081e96f4f08 100644 --- a/solr/core/src/test/org/apache/solr/cloud/CustomCollectionTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/CustomCollectionTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.lucene.util.TestUtil; diff --git a/solr/core/src/test/org/apache/solr/cloud/DeleteInactiveReplicaTest.java b/solr/core/src/test/org/apache/solr/cloud/DeleteInactiveReplicaTest.java index 68e8da9ca7a..959d3b21680 100644 --- a/solr/core/src/test/org/apache/solr/cloud/DeleteInactiveReplicaTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/DeleteInactiveReplicaTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import static org.apache.solr.cloud.CollectionsAPIDistributedZkTest.*; diff --git a/solr/core/src/test/org/apache/solr/cloud/DeleteLastCustomShardedReplicaTest.java b/solr/core/src/test/org/apache/solr/cloud/DeleteLastCustomShardedReplicaTest.java index f7ef578d8a2..5d3d60487df 100644 --- a/solr/core/src/test/org/apache/solr/cloud/DeleteLastCustomShardedReplicaTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/DeleteLastCustomShardedReplicaTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.solr.client.solrj.SolrRequest; import org.apache.solr.client.solrj.SolrServerException; diff --git a/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java b/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java index 3e44b10b4fb..b1f8c49dc15 100644 --- a/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/DeleteReplicaTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.solr.client.solrj.SolrRequest; import org.apache.solr.client.solrj.SolrServerException; diff --git a/solr/core/src/test/org/apache/solr/cloud/DeleteShardTest.java b/solr/core/src/test/org/apache/solr/cloud/DeleteShardTest.java index 7994872c6b0..d355ce71032 100644 --- a/solr/core/src/test/org/apache/solr/cloud/DeleteShardTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/DeleteShardTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.solr.client.solrj.SolrRequest; import org.apache.solr.client.solrj.SolrServerException; diff --git a/solr/core/src/test/org/apache/solr/cloud/DistribJoinFromCollectionTest.java b/solr/core/src/test/org/apache/solr/cloud/DistribJoinFromCollectionTest.java index 75e53022b55..ef00df3e482 100644 --- a/solr/core/src/test/org/apache/solr/cloud/DistribJoinFromCollectionTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/DistribJoinFromCollectionTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.solr.client.solrj.SolrServerException; import org.apache.solr.client.solrj.impl.HttpSolrClient; diff --git a/solr/core/src/test/org/apache/solr/cloud/DistributedQueueTest.java b/solr/core/src/test/org/apache/solr/cloud/DistributedQueueTest.java index 1124ef553c9..840e7e51f7f 100644 --- a/solr/core/src/test/org/apache/solr/cloud/DistributedQueueTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/DistributedQueueTest.java @@ -1,20 +1,20 @@ -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 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 + * 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 + * 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. + * 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 java.nio.charset.Charset; import java.util.NoSuchElementException; diff --git a/solr/core/src/test/org/apache/solr/cloud/DistributedVersionInfoTest.java b/solr/core/src/test/org/apache/solr/cloud/DistributedVersionInfoTest.java index 7b4e1bfe3e1..898f38a1874 100644 --- a/solr/core/src/test/org/apache/solr/cloud/DistributedVersionInfoTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/DistributedVersionInfoTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/test/org/apache/solr/cloud/ForceLeaderTest.java b/solr/core/src/test/org/apache/solr/cloud/ForceLeaderTest.java index 790a354fc4a..dcfc32981d1 100644 --- a/solr/core/src/test/org/apache/solr/cloud/ForceLeaderTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/ForceLeaderTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java b/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java index 3313de7f200..26099142d85 100644 --- a/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/FullSolrCloudDistribCmdsTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.solr.SolrTestCaseJ4.SuppressSSL; diff --git a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java index e36f5ce16d9..8fecc84045a 100644 --- a/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.io.File; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/cloud/KerberosTestUtil.java b/solr/core/src/test/org/apache/solr/cloud/KerberosTestUtil.java index c4ffe9c5d4b..7f544ef8fef 100644 --- a/solr/core/src/test/org/apache/solr/cloud/KerberosTestUtil.java +++ b/solr/core/src/test/org/apache/solr/cloud/KerberosTestUtil.java @@ -1,18 +1,3 @@ -package org.apache.solr.cloud; - -import java.io.File; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Properties; - -import javax.security.auth.login.AppConfigurationEntry; -import javax.security.auth.login.Configuration; - -import org.apache.hadoop.minikdc.MiniKdc; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -29,6 +14,20 @@ import org.apache.hadoop.minikdc.MiniKdc; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; + +import java.io.File; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Properties; + +import javax.security.auth.login.AppConfigurationEntry; +import javax.security.auth.login.Configuration; + +import org.apache.hadoop.minikdc.MiniKdc; public class KerberosTestUtil { diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java index 8677c02df00..bd55614c286 100644 --- a/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import javax.xml.parsers.ParserConfigurationException; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java index d7990a0bc61..7100a8e3a1c 100644 --- a/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/LeaderElectionTest.java @@ -1,23 +1,21 @@ -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 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 - * + * 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. + * 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 java.io.File; import java.io.IOException; import java.lang.invoke.MethodHandles; import java.util.ArrayList; diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderFailoverAfterPartitionTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderFailoverAfterPartitionTest.java index 23328c380a6..6fd7c534809 100644 --- a/solr/core/src/test/org/apache/solr/cloud/LeaderFailoverAfterPartitionTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/LeaderFailoverAfterPartitionTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.solr.SolrTestCaseJ4.SuppressSSL; diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnCommitTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnCommitTest.java index 672c650e2a2..8d2cc70c786 100644 --- a/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnCommitTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnCommitTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.http.NoHttpResponseException; import org.apache.solr.client.solrj.embedded.JettySolrRunner; diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnShardRestartTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnShardRestartTest.java index 3d3b75a9bcb..d130f3bbcd7 100644 --- a/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnShardRestartTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/LeaderInitiatedRecoveryOnShardRestartTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.lang.invoke.MethodHandles; import java.util.Map; diff --git a/solr/core/src/test/org/apache/solr/cloud/MigrateRouteKeyTest.java b/solr/core/src/test/org/apache/solr/cloud/MigrateRouteKeyTest.java index 0b228e68c28..f9566e30f08 100644 --- a/solr/core/src/test/org/apache/solr/cloud/MigrateRouteKeyTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/MigrateRouteKeyTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.solr.client.solrj.SolrQuery; import org.apache.solr.client.solrj.SolrRequest; diff --git a/solr/core/src/test/org/apache/solr/cloud/MultiThreadedOCPTest.java b/solr/core/src/test/org/apache/solr/cloud/MultiThreadedOCPTest.java index d918b95a8e6..11955831bfa 100644 --- a/solr/core/src/test/org/apache/solr/cloud/MultiThreadedOCPTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/MultiThreadedOCPTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/test/org/apache/solr/cloud/OutOfBoxZkACLAndCredentialsProvidersTest.java b/solr/core/src/test/org/apache/solr/cloud/OutOfBoxZkACLAndCredentialsProvidersTest.java index ff5a62167ed..51ad523aca5 100644 --- a/solr/core/src/test/org/apache/solr/cloud/OutOfBoxZkACLAndCredentialsProvidersTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/OutOfBoxZkACLAndCredentialsProvidersTest.java @@ -1,3 +1,19 @@ +/* + * 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 java.io.File; @@ -18,23 +34,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 OutOfBoxZkACLAndCredentialsProvidersTest extends SolrTestCaseJ4 { private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); diff --git a/solr/core/src/test/org/apache/solr/cloud/OverriddenZkACLAndCredentialsProvidersTest.java b/solr/core/src/test/org/apache/solr/cloud/OverriddenZkACLAndCredentialsProvidersTest.java index 40d5bdfc0fe..b87ab1be261 100644 --- a/solr/core/src/test/org/apache/solr/cloud/OverriddenZkACLAndCredentialsProvidersTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/OverriddenZkACLAndCredentialsProvidersTest.java @@ -1,3 +1,19 @@ +/* + * 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 org.apache.solr.SolrTestCaseJ4; @@ -29,23 +45,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -/* - * 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 OverriddenZkACLAndCredentialsProvidersTest extends SolrTestCaseJ4 { private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); diff --git a/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.java b/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.java index b4e227f0ac6..f5a09b0da13 100644 --- a/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.client.solrj.SolrResponse; diff --git a/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.java b/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.java index d5481fb6748..9c563de7fc7 100644 --- a/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.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 @@ -16,7 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.cloud; import org.apache.lucene.util.LuceneTestCase; import org.apache.solr.SolrTestCaseJ4.SuppressSSL; diff --git a/solr/core/src/test/org/apache/solr/cloud/OverseerStatusTest.java b/solr/core/src/test/org/apache/solr/cloud/OverseerStatusTest.java index 12082327329..b1899da9b49 100644 --- a/solr/core/src/test/org/apache/solr/cloud/OverseerStatusTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/OverseerStatusTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.solr.client.solrj.request.CollectionAdminRequest; import org.apache.solr.client.solrj.response.CollectionAdminResponse; diff --git a/solr/core/src/test/org/apache/solr/cloud/OverseerTaskQueueTest.java b/solr/core/src/test/org/apache/solr/cloud/OverseerTaskQueueTest.java index 72a046fec25..028f85fb272 100644 --- a/solr/core/src/test/org/apache/solr/cloud/OverseerTaskQueueTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/OverseerTaskQueueTest.java @@ -1,20 +1,20 @@ -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 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 + * 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 + * 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. + * 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; public class OverseerTaskQueueTest extends DistributedQueueTest { diff --git a/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java b/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java index e637eae8e49..fb640c33b18 100644 --- a/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/OverseerTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import javax.xml.parsers.ParserConfigurationException; import java.io.File; diff --git a/solr/core/src/test/org/apache/solr/cloud/RecoveryAfterSoftCommitTest.java b/solr/core/src/test/org/apache/solr/cloud/RecoveryAfterSoftCommitTest.java index 26093766db0..cb9aea28e87 100644 --- a/solr/core/src/test/org/apache/solr/cloud/RecoveryAfterSoftCommitTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/RecoveryAfterSoftCommitTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.io.File; import java.util.List; diff --git a/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java b/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java index 656ff954e82..a0cb4dcfc7e 100644 --- a/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/RecoveryZkTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/cloud/RemoteQueryErrorTest.java b/solr/core/src/test/org/apache/solr/cloud/RemoteQueryErrorTest.java index c583a1aa132..73d9396191d 100644 --- a/solr/core/src/test/org/apache/solr/cloud/RemoteQueryErrorTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/RemoteQueryErrorTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.solr.client.solrj.SolrClient; diff --git a/solr/core/src/test/org/apache/solr/cloud/ReplicaPropertiesBase.java b/solr/core/src/test/org/apache/solr/cloud/ReplicaPropertiesBase.java index 283577897e4..8347af09372 100644 --- a/solr/core/src/test/org/apache/solr/cloud/ReplicaPropertiesBase.java +++ b/solr/core/src/test/org/apache/solr/cloud/ReplicaPropertiesBase.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.commons.lang.StringUtils; import org.apache.solr.client.solrj.SolrServerException; diff --git a/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java b/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java index 79b96171c5b..894f26d70f4 100644 --- a/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.io.File; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/test/org/apache/solr/cloud/RestartWhileUpdatingTest.java b/solr/core/src/test/org/apache/solr/cloud/RestartWhileUpdatingTest.java index cde4ee7aaa8..c226fec5258 100644 --- a/solr/core/src/test/org/apache/solr/cloud/RestartWhileUpdatingTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/RestartWhileUpdatingTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.io.IOException; import java.util.ArrayList; diff --git a/solr/core/src/test/org/apache/solr/cloud/RollingRestartTest.java b/solr/core/src/test/org/apache/solr/cloud/RollingRestartTest.java index 6951bcd0e85..6a906bbc019 100644 --- a/solr/core/src/test/org/apache/solr/cloud/RollingRestartTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/RollingRestartTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.commons.collections.CollectionUtils; import org.apache.solr.client.solrj.request.CollectionAdminRequest; diff --git a/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.java b/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.java index e11e884b39f..a0bb08f822a 100644 --- a/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/SSLMigrationTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.commons.lang.StringUtils; import org.apache.lucene.util.LuceneTestCase.BadApple; diff --git a/solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java b/solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java index 409a7700f7e..9d457468147 100644 --- a/solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/SaslZkACLProviderTest.java @@ -1,3 +1,19 @@ +/* + * 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 java.io.File; @@ -25,23 +41,6 @@ import org.slf4j.LoggerFactory; import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters; -/* - * 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. - */ - @ThreadLeakFilters(defaultFilters = true, filters = { BadZookeeperThreadsFilter.class // hdfs currently leaks thread(s) }) diff --git a/solr/core/src/test/org/apache/solr/cloud/ShardRoutingCustomTest.java b/solr/core/src/test/org/apache/solr/cloud/ShardRoutingCustomTest.java index f060c55a4b3..c5e35c39928 100644 --- a/solr/core/src/test/org/apache/solr/cloud/ShardRoutingCustomTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/ShardRoutingCustomTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.io.File; diff --git a/solr/core/src/test/org/apache/solr/cloud/ShardRoutingTest.java b/solr/core/src/test/org/apache/solr/cloud/ShardRoutingTest.java index 50b1716aa39..5045ca88dab 100644 --- a/solr/core/src/test/org/apache/solr/cloud/ShardRoutingTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/ShardRoutingTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.embedded.JettySolrRunner; diff --git a/solr/core/src/test/org/apache/solr/cloud/ShardSplitTest.java b/solr/core/src/test/org/apache/solr/cloud/ShardSplitTest.java index b982a9e85f1..bbcae33aa1e 100644 --- a/solr/core/src/test/org/apache/solr/cloud/ShardSplitTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/ShardSplitTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.http.params.CoreConnectionPNames; import org.apache.lucene.util.LuceneTestCase.Slow; diff --git a/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverTest.java b/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverTest.java index 026bc81cfbe..6fbb58b719e 100644 --- a/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import static org.apache.solr.common.util.Utils.makeMap; diff --git a/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverUtilsTest.java b/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverUtilsTest.java index e22f13c0961..e108ee50ec3 100644 --- a/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverUtilsTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/SharedFSAutoReplicaFailoverUtilsTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.io.Closeable; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/cloud/SimpleCollectionCreateDeleteTest.java b/solr/core/src/test/org/apache/solr/cloud/SimpleCollectionCreateDeleteTest.java index 1481323f1e3..773559b3006 100644 --- a/solr/core/src/test/org/apache/solr/cloud/SimpleCollectionCreateDeleteTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/SimpleCollectionCreateDeleteTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.solr.client.solrj.request.CollectionAdminRequest; import org.apache.solr.client.solrj.request.QueryRequest; diff --git a/solr/core/src/test/org/apache/solr/cloud/SliceStateTest.java b/solr/core/src/test/org/apache/solr/cloud/SliceStateTest.java index 49ddfdd5335..6a633fafe0b 100644 --- a/solr/core/src/test/org/apache/solr/cloud/SliceStateTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/SliceStateTest.java @@ -1,21 +1,20 @@ -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 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 - * + * 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. + * 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 org.apache.solr.SolrTestCaseJ4; import org.apache.solr.common.cloud.ClusterState; diff --git a/solr/core/src/test/org/apache/solr/cloud/SolrCloudExampleTest.java b/solr/core/src/test/org/apache/solr/cloud/SolrCloudExampleTest.java index 929e909fa1d..606d066fac9 100644 --- a/solr/core/src/test/org/apache/solr/cloud/SolrCloudExampleTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/SolrCloudExampleTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.io.File; import java.io.FilenameFilter; diff --git a/solr/core/src/test/org/apache/solr/cloud/SolrXmlInZkTest.java b/solr/core/src/test/org/apache/solr/cloud/SolrXmlInZkTest.java index daec0b9a348..2642814850b 100644 --- a/solr/core/src/test/org/apache/solr/cloud/SolrXmlInZkTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/SolrXmlInZkTest.java @@ -1,20 +1,20 @@ -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 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 + * 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 + * 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. + * 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 java.io.File; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java b/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java index 950998b6896..e753be9f459 100644 --- a/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.solr.client.solrj.SolrQuery; diff --git a/solr/core/src/test/org/apache/solr/cloud/TestAuthenticationFramework.java b/solr/core/src/test/org/apache/solr/cloud/TestAuthenticationFramework.java index 86864604c2d..b9c72643030 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestAuthenticationFramework.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestAuthenticationFramework.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import javax.servlet.FilterChain; import javax.servlet.ServletRequest; diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudInspectUtil.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudInspectUtil.java index 6030463899a..c68bffd296f 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestCloudInspectUtil.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudInspectUtil.java @@ -1,7 +1,3 @@ -package org.apache.solr.cloud; - -import java.lang.invoke.MethodHandles; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import java.lang.invoke.MethodHandles; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; + +import java.lang.invoke.MethodHandles; import java.util.HashSet; import java.util.Set; diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCollectionAPI.java b/solr/core/src/test/org/apache/solr/cloud/TestCollectionAPI.java index 7ceae7afca9..18aa33b5fb5 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestCollectionAPI.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestCollectionAPI.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 @@ -16,7 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.cloud; import java.io.IOException; import java.util.ArrayList; diff --git a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java index d9290b64ca1..b505930afe8 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPI.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.cloud; import java.io.ByteArrayInputStream; diff --git a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIExclusivity.java b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIExclusivity.java index 153e7be7b92..2d2aa58853d 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIExclusivity.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIExclusivity.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.cloud; import java.io.File; diff --git a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIZkFailure.java b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIZkFailure.java index 36ad2ffeede..9e5989adaf1 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIZkFailure.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestConfigSetsAPIZkFailure.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.cloud; import java.io.File; diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCryptoKeys.java b/solr/core/src/test/org/apache/solr/cloud/TestCryptoKeys.java index bc79b52af44..cdbc170b8ed 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestCryptoKeys.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestCryptoKeys.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.io.FileInputStream; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/cloud/TestDistribDocBasedVersion.java b/solr/core/src/test/org/apache/solr/cloud/TestDistribDocBasedVersion.java index 52c50eea765..946b3941909 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestDistribDocBasedVersion.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestDistribDocBasedVersion.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.request.UpdateRequest; diff --git a/solr/core/src/test/org/apache/solr/cloud/TestDownShardTolerantSearch.java b/solr/core/src/test/org/apache/solr/cloud/TestDownShardTolerantSearch.java index 9334fd6d97b..01c444066f0 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestDownShardTolerantSearch.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestDownShardTolerantSearch.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/test/org/apache/solr/cloud/TestExclusionRuleCollectionAccess.java b/solr/core/src/test/org/apache/solr/cloud/TestExclusionRuleCollectionAccess.java index 79627ada789..9ef2dcd40f9 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestExclusionRuleCollectionAccess.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestExclusionRuleCollectionAccess.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.lucene.util.LuceneTestCase; import org.apache.solr.client.solrj.SolrClient; diff --git a/solr/core/src/test/org/apache/solr/cloud/TestHashPartitioner.java b/solr/core/src/test/org/apache/solr/cloud/TestHashPartitioner.java index 772648a6961..c84c2048857 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestHashPartitioner.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestHashPartitioner.java @@ -1,21 +1,20 @@ -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 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 - * + * 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. + * 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 java.util.Collection; import java.util.HashMap; diff --git a/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionZkExpiry.java b/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionZkExpiry.java index dfa52715ff1..b890777437b 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionZkExpiry.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionZkExpiry.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.lang.invoke.MethodHandles; import java.nio.file.Path; diff --git a/solr/core/src/test/org/apache/solr/cloud/TestLeaderInitiatedRecoveryThread.java b/solr/core/src/test/org/apache/solr/cloud/TestLeaderInitiatedRecoveryThread.java index ec1b4dd4eb1..f2c58cf808a 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestLeaderInitiatedRecoveryThread.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestLeaderInitiatedRecoveryThread.java @@ -1,19 +1,3 @@ -package org.apache.solr.cloud; - -import java.util.Properties; -import java.util.concurrent.TimeUnit; - -import org.apache.solr.SolrTestCaseJ4; -import org.apache.solr.common.SolrException; -import org.apache.solr.common.cloud.Replica; -import org.apache.solr.common.cloud.ZkCoreNodeProps; -import org.apache.solr.common.cloud.ZkStateReader; -import org.apache.solr.core.CoreContainer; -import org.apache.solr.util.MockCoreContainer.MockCoreDescriptor; -import org.apache.solr.util.TimeOut; -import org.apache.zookeeper.KeeperException; -import org.apache.zookeeper.data.Stat; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -30,6 +14,21 @@ import org.apache.zookeeper.data.Stat; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; + +import java.util.Properties; +import java.util.concurrent.TimeUnit; + +import org.apache.solr.SolrTestCaseJ4; +import org.apache.solr.common.SolrException; +import org.apache.solr.common.cloud.Replica; +import org.apache.solr.common.cloud.ZkCoreNodeProps; +import org.apache.solr.common.cloud.ZkStateReader; +import org.apache.solr.core.CoreContainer; +import org.apache.solr.util.MockCoreContainer.MockCoreDescriptor; +import org.apache.solr.util.TimeOut; +import org.apache.zookeeper.KeeperException; +import org.apache.zookeeper.data.Stat; /** * Test for {@link LeaderInitiatedRecoveryThread} diff --git a/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudCluster.java b/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudCluster.java index 90b9dd84b79..0830563fd6a 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudCluster.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudCluster.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.io.File; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterBase.java b/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterBase.java index 0385a619d59..e5d092d13fd 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterBase.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterBase.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 @@ -16,7 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.cloud; import java.io.File; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterKerberos.java b/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterKerberos.java index e9a5279f2ee..48f17103cf6 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterKerberos.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterKerberos.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import javax.security.auth.login.Configuration; import java.io.File; diff --git a/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java b/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java index bc9d7827878..bc4352f731f 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.util.List; diff --git a/solr/core/src/test/org/apache/solr/cloud/TestRandomRequestDistribution.java b/solr/core/src/test/org/apache/solr/cloud/TestRandomRequestDistribution.java index f3f250b7edf..0907fc9d4ff 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestRandomRequestDistribution.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestRandomRequestDistribution.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.lang.invoke.MethodHandles; import java.util.ArrayList; diff --git a/solr/core/src/test/org/apache/solr/cloud/TestRebalanceLeaders.java b/solr/core/src/test/org/apache/solr/cloud/TestRebalanceLeaders.java index 11ebc6e5f31..3c720bfeddf 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestRebalanceLeaders.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestRebalanceLeaders.java @@ -1,4 +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 @@ -15,7 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.cloud; import java.io.IOException; import java.lang.invoke.MethodHandles; import java.util.ArrayList; diff --git a/solr/core/src/test/org/apache/solr/cloud/TestReplicaProperties.java b/solr/core/src/test/org/apache/solr/cloud/TestReplicaProperties.java index b8a02c41290..5cc15e2ba36 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestReplicaProperties.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestReplicaProperties.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 @@ -16,7 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.cloud; import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.solr.client.solrj.SolrRequest; diff --git a/solr/core/src/test/org/apache/solr/cloud/TestRequestForwarding.java b/solr/core/src/test/org/apache/solr/cloud/TestRequestForwarding.java index dbe7a5969aa..e4737c45686 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestRequestForwarding.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestRequestForwarding.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.io.File; import java.net.URL; diff --git a/solr/core/src/test/org/apache/solr/cloud/TestRequestStatusCollectionAPI.java b/solr/core/src/test/org/apache/solr/cloud/TestRequestStatusCollectionAPI.java index 8f382b569aa..485558fff29 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestRequestStatusCollectionAPI.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestRequestStatusCollectionAPI.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.solr.client.solrj.SolrRequest; import org.apache.solr.client.solrj.SolrServerException; diff --git a/solr/core/src/test/org/apache/solr/cloud/TestShortCircuitedRequests.java b/solr/core/src/test/org/apache/solr/cloud/TestShortCircuitedRequests.java index babc51d69d5..4233e9d84c2 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestShortCircuitedRequests.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestShortCircuitedRequests.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.solr.client.solrj.SolrQuery; import org.apache.solr.client.solrj.SolrClient; diff --git a/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithKerberosAlt.java b/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithKerberosAlt.java index 5071f398580..76850b6e272 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithKerberosAlt.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestSolrCloudWithKerberosAlt.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import javax.security.auth.login.Configuration; diff --git a/solr/core/src/test/org/apache/solr/cloud/TestZkChroot.java b/solr/core/src/test/org/apache/solr/cloud/TestZkChroot.java index a0601f68c80..874c6ec99de 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestZkChroot.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestZkChroot.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.nio.file.Path; import java.nio.file.Paths; diff --git a/solr/core/src/test/org/apache/solr/cloud/TriLevelCompositeIdRoutingTest.java b/solr/core/src/test/org/apache/solr/cloud/TriLevelCompositeIdRoutingTest.java index b11747e6844..2710eafc975 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TriLevelCompositeIdRoutingTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/TriLevelCompositeIdRoutingTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.solr.client.solrj.response.QueryResponse; diff --git a/solr/core/src/test/org/apache/solr/cloud/UnloadDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/UnloadDistributedZkTest.java index ef203f03e1f..52a8eab857b 100644 --- a/solr/core/src/test/org/apache/solr/cloud/UnloadDistributedZkTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/UnloadDistributedZkTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.solr.SolrTestCaseJ4.SuppressSSL; diff --git a/solr/core/src/test/org/apache/solr/cloud/VMParamsZkACLAndCredentialsProvidersTest.java b/solr/core/src/test/org/apache/solr/cloud/VMParamsZkACLAndCredentialsProvidersTest.java index f24a798e4b7..31919a81af8 100644 --- a/solr/core/src/test/org/apache/solr/cloud/VMParamsZkACLAndCredentialsProvidersTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/VMParamsZkACLAndCredentialsProvidersTest.java @@ -1,3 +1,19 @@ +/* + * 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 java.io.File; @@ -16,23 +32,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 VMParamsZkACLAndCredentialsProvidersTest extends SolrTestCaseJ4 { private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); diff --git a/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java b/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java index 2072aa809fe..19cea70d582 100644 --- a/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java +++ b/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; diff --git a/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java b/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java index 812c6d5445c..cffbb543e49 100644 --- a/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java @@ -1,21 +1,20 @@ -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 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 - * + * 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. + * 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 org.apache.lucene.util.LuceneTestCase.Slow; import org.apache.solr.SolrTestCaseJ4; @@ -26,7 +25,6 @@ import org.apache.solr.common.cloud.Replica; import org.apache.solr.common.cloud.Slice; import org.apache.solr.common.cloud.SolrZkClient; import org.apache.solr.common.cloud.ZkConfigManager; -import org.apache.solr.common.cloud.ZkCoreNodeProps; import org.apache.solr.common.cloud.ZkNodeProps; import org.apache.solr.common.cloud.ZkStateReader; import org.apache.solr.common.util.Utils; diff --git a/solr/core/src/test/org/apache/solr/cloud/ZkNodePropsTest.java b/solr/core/src/test/org/apache/solr/cloud/ZkNodePropsTest.java index b80ff066a64..11e93d67655 100644 --- a/solr/core/src/test/org/apache/solr/cloud/ZkNodePropsTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/ZkNodePropsTest.java @@ -1,21 +1,20 @@ -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 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 - * + * 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. + * 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 java.io.IOException; import java.util.HashMap; diff --git a/solr/core/src/test/org/apache/solr/cloud/ZkSolrClientTest.java b/solr/core/src/test/org/apache/solr/cloud/ZkSolrClientTest.java index 267a6829221..0805cf149a5 100644 --- a/solr/core/src/test/org/apache/solr/cloud/ZkSolrClientTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/ZkSolrClientTest.java @@ -1,21 +1,20 @@ -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 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 - * + * 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. + * 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 java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; diff --git a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsBasicDistributedZk2Test.java b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsBasicDistributedZk2Test.java index fe23ea4e336..a0b4a42862a 100644 --- a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsBasicDistributedZk2Test.java +++ b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsBasicDistributedZk2Test.java @@ -1,5 +1,3 @@ -package org.apache.solr.cloud.hdfs; - /* * 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.cloud.hdfs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud.hdfs; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsBasicDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsBasicDistributedZkTest.java index 1f3fe3e45a4..70eaf90e9b3 100644 --- a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsBasicDistributedZkTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsBasicDistributedZkTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.cloud.hdfs; - /* * 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.cloud.hdfs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud.hdfs; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsChaosMonkeyNothingIsSafeTest.java b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsChaosMonkeyNothingIsSafeTest.java index ec6a234b9c3..8399d67e2e7 100644 --- a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsChaosMonkeyNothingIsSafeTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsChaosMonkeyNothingIsSafeTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.cloud.hdfs; - /* * 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.cloud.hdfs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud.hdfs; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsChaosMonkeySafeLeaderTest.java b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsChaosMonkeySafeLeaderTest.java index 0f6e9060136..525b62dc50f 100644 --- a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsChaosMonkeySafeLeaderTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsChaosMonkeySafeLeaderTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.cloud.hdfs; - /* * 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.cloud.hdfs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud.hdfs; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsCollectionsAPIDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsCollectionsAPIDistributedZkTest.java index 4b09e480e4d..3b02477d0a7 100644 --- a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsCollectionsAPIDistributedZkTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsCollectionsAPIDistributedZkTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.cloud.hdfs; - /* * 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.cloud.hdfs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud.hdfs; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsNNFailoverTest.java b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsNNFailoverTest.java index 9420736ef2e..6e510de876a 100644 --- a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsNNFailoverTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsNNFailoverTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.cloud.hdfs; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsRecoverLeaseTest.java b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsRecoverLeaseTest.java index 76b7f6caa91..fcacb8b5d58 100644 --- a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsRecoverLeaseTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsRecoverLeaseTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.cloud.hdfs; - /* * 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.cloud.hdfs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud.hdfs; import java.io.IOException; import java.net.URI; diff --git a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsRecoveryZkTest.java b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsRecoveryZkTest.java index 759a32f8afe..a8e6fb0cf3b 100644 --- a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsRecoveryZkTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsRecoveryZkTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.cloud.hdfs; - /* * 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.cloud.hdfs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud.hdfs; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsRestartWhileUpdatingTest.java b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsRestartWhileUpdatingTest.java index 76924d8381d..e802f3e157f 100644 --- a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsRestartWhileUpdatingTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsRestartWhileUpdatingTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.cloud.hdfs; - /* * 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.cloud.hdfs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud.hdfs; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsSyncSliceTest.java b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsSyncSliceTest.java index baf3577a011..1b6338b21de 100644 --- a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsSyncSliceTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsSyncSliceTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.cloud.hdfs; - /* * 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.cloud.hdfs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud.hdfs; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsTestUtil.java b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsTestUtil.java index 3ed975a8468..12d565166bf 100644 --- a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsTestUtil.java +++ b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsTestUtil.java @@ -1,3 +1,19 @@ +/* + * 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.hdfs; import java.io.File; @@ -26,23 +42,6 @@ import org.apache.solr.util.HdfsUtil; 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 HdfsTestUtil { private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); diff --git a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsThreadLeakTest.java b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsThreadLeakTest.java index 7c87aa7592e..8a86ee2c326 100644 --- a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsThreadLeakTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsThreadLeakTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.cloud.hdfs; - /* * 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.cloud.hdfs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud.hdfs; import java.io.IOException; import java.net.URI; diff --git a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsUnloadDistributedZkTest.java b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsUnloadDistributedZkTest.java index 7f6faec4f28..13bdbcdaee4 100644 --- a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsUnloadDistributedZkTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsUnloadDistributedZkTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.cloud.hdfs; - /* * 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.cloud.hdfs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud.hdfs; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsWriteToMultipleCollectionsTest.java b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsWriteToMultipleCollectionsTest.java index 59185742284..5faa065ae89 100644 --- a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsWriteToMultipleCollectionsTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsWriteToMultipleCollectionsTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.cloud.hdfs; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java b/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java index 8b647473e00..445c4b8f615 100644 --- a/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.cloud.hdfs; import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters; diff --git a/solr/core/src/test/org/apache/solr/cloud/overseer/TestClusterStateMutator.java b/solr/core/src/test/org/apache/solr/cloud/overseer/TestClusterStateMutator.java index 5e1cb9a75d8..18cf7636666 100644 --- a/solr/core/src/test/org/apache/solr/cloud/overseer/TestClusterStateMutator.java +++ b/solr/core/src/test/org/apache/solr/cloud/overseer/TestClusterStateMutator.java @@ -1,5 +1,3 @@ -package org.apache.solr.cloud.overseer; - /* * 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.cloud.overseer; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud.overseer; import java.util.Collections; diff --git a/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateReaderTest.java b/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateReaderTest.java index db5c29f7722..69626b0828b 100644 --- a/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateReaderTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateReaderTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.cloud.overseer; - /* * 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.cloud.overseer; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud.overseer; import java.util.HashMap; import java.util.Map; diff --git a/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateWriterTest.java b/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateWriterTest.java index 43f95dfb86b..8e7b0098121 100644 --- a/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateWriterTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateWriterTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.cloud.overseer; - /* * 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.cloud.overseer; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud.overseer; import org.apache.lucene.util.IOUtils; import org.apache.solr.SolrTestCaseJ4; diff --git a/solr/core/src/test/org/apache/solr/cloud/rule/RuleEngineTest.java b/solr/core/src/test/org/apache/solr/cloud/rule/RuleEngineTest.java index bc1b1c3908b..ad98e61284a 100644 --- a/solr/core/src/test/org/apache/solr/cloud/rule/RuleEngineTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/rule/RuleEngineTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.cloud.rule; - /* * 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.cloud.rule; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud.rule; import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/solr/core/src/test/org/apache/solr/cloud/rule/RulesTest.java b/solr/core/src/test/org/apache/solr/cloud/rule/RulesTest.java index 84288ab05c4..cf8cfd7c716 100644 --- a/solr/core/src/test/org/apache/solr/cloud/rule/RulesTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/rule/RulesTest.java @@ -1,7 +1,3 @@ -package org.apache.solr.cloud.rule; - -import java.lang.invoke.MethodHandles; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import java.lang.invoke.MethodHandles; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud.rule; + +import java.lang.invoke.MethodHandles; import java.util.List; import java.util.Map; diff --git a/solr/core/src/test/org/apache/solr/core/BlobStoreTestRequestHandler.java b/solr/core/src/test/org/apache/solr/core/BlobStoreTestRequestHandler.java index e6f8f490e5f..893533e8d1b 100644 --- a/solr/core/src/test/org/apache/solr/core/BlobStoreTestRequestHandler.java +++ b/solr/core/src/test/org/apache/solr/core/BlobStoreTestRequestHandler.java @@ -1,5 +1,3 @@ -package org.apache.solr.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,7 +14,7 @@ package org.apache.solr.core; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.core; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/core/CachingDirectoryFactoryTest.java b/solr/core/src/test/org/apache/solr/core/CachingDirectoryFactoryTest.java index 121732c5b6f..7a7fb9c8200 100644 --- a/solr/core/src/test/org/apache/solr/core/CachingDirectoryFactoryTest.java +++ b/solr/core/src/test/org/apache/solr/core/CachingDirectoryFactoryTest.java @@ -1,3 +1,19 @@ +/* + * 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.core; import java.io.IOException; @@ -18,23 +34,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 CachingDirectoryFactoryTest extends SolrTestCaseJ4 { private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); diff --git a/solr/core/src/test/org/apache/solr/core/CountUsageValueSourceParser.java b/solr/core/src/test/org/apache/solr/core/CountUsageValueSourceParser.java index 2e8132a2ad9..c7c1a50926e 100644 --- a/solr/core/src/test/org/apache/solr/core/CountUsageValueSourceParser.java +++ b/solr/core/src/test/org/apache/solr/core/CountUsageValueSourceParser.java @@ -1,4 +1,3 @@ -package org.apache.solr.core; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.core; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.core; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.queries.function.FunctionValues; import org.apache.lucene.queries.function.ValueSource; diff --git a/solr/core/src/test/org/apache/solr/core/DirectoryFactoryTest.java b/solr/core/src/test/org/apache/solr/core/DirectoryFactoryTest.java index 80e0f80c177..59868b53d8d 100755 --- a/solr/core/src/test/org/apache/solr/core/DirectoryFactoryTest.java +++ b/solr/core/src/test/org/apache/solr/core/DirectoryFactoryTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.core; import org.apache.lucene.util.LuceneTestCase; diff --git a/solr/core/src/test/org/apache/solr/core/DummyValueSourceParser.java b/solr/core/src/test/org/apache/solr/core/DummyValueSourceParser.java index 068e045a23d..2d83438d9d9 100644 --- a/solr/core/src/test/org/apache/solr/core/DummyValueSourceParser.java +++ b/solr/core/src/test/org/apache/solr/core/DummyValueSourceParser.java @@ -1,4 +1,3 @@ -package org.apache.solr.core; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.core; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.core; import org.apache.lucene.queries.function.FunctionValues; import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.queries.function.valuesource.SimpleFloatFunction; diff --git a/solr/core/src/test/org/apache/solr/core/ExitableDirectoryReaderTest.java b/solr/core/src/test/org/apache/solr/core/ExitableDirectoryReaderTest.java index 83e02a46128..5223c9f8437 100644 --- a/solr/core/src/test/org/apache/solr/core/ExitableDirectoryReaderTest.java +++ b/solr/core/src/test/org/apache/solr/core/ExitableDirectoryReaderTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,8 +13,8 @@ package org.apache.solr.core; * 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.core; import java.util.Map; diff --git a/solr/core/src/test/org/apache/solr/core/HdfsDirectoryFactoryTest.java b/solr/core/src/test/org/apache/solr/core/HdfsDirectoryFactoryTest.java index b44eb9b0421..1d6c1b39607 100644 --- a/solr/core/src/test/org/apache/solr/core/HdfsDirectoryFactoryTest.java +++ b/solr/core/src/test/org/apache/solr/core/HdfsDirectoryFactoryTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.core; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/core/MockInfoMBean.java b/solr/core/src/test/org/apache/solr/core/MockInfoMBean.java index 0b436247f0f..b81e7379c56 100644 --- a/solr/core/src/test/org/apache/solr/core/MockInfoMBean.java +++ b/solr/core/src/test/org/apache/solr/core/MockInfoMBean.java @@ -1,10 +1,3 @@ -package org.apache.solr.core; - -import java.net.URL; - -import org.apache.solr.common.util.NamedList; -import org.apache.solr.core.SolrInfoMBean.Category; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -21,6 +14,12 @@ import org.apache.solr.core.SolrInfoMBean.Category; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.core; + +import java.net.URL; + +import org.apache.solr.common.util.NamedList; +import org.apache.solr.core.SolrInfoMBean.Category; class MockInfoMBean implements SolrInfoMBean { @Override diff --git a/solr/core/src/test/org/apache/solr/core/MockShardHandlerFactory.java b/solr/core/src/test/org/apache/solr/core/MockShardHandlerFactory.java index b867b85ccfb..3f4bb1de3f1 100644 --- a/solr/core/src/test/org/apache/solr/core/MockShardHandlerFactory.java +++ b/solr/core/src/test/org/apache/solr/core/MockShardHandlerFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.core; - /* * 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.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.core; import org.apache.solr.common.params.ModifiableSolrParams; import org.apache.solr.common.util.NamedList; diff --git a/solr/core/src/test/org/apache/solr/core/OpenCloseCoreStressTest.java b/solr/core/src/test/org/apache/solr/core/OpenCloseCoreStressTest.java index f0d8e436370..7875b7c6c13 100644 --- a/solr/core/src/test/org/apache/solr/core/OpenCloseCoreStressTest.java +++ b/solr/core/src/test/org/apache/solr/core/OpenCloseCoreStressTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.core; import org.apache.commons.io.FileUtils; diff --git a/solr/core/src/test/org/apache/solr/core/PluginInfoTest.java b/solr/core/src/test/org/apache/solr/core/PluginInfoTest.java index a42c2efd60d..23532267487 100644 --- a/solr/core/src/test/org/apache/solr/core/PluginInfoTest.java +++ b/solr/core/src/test/org/apache/solr/core/PluginInfoTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.core; - /* * 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.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.core; import java.util.List; diff --git a/solr/core/src/test/org/apache/solr/core/QueryResultKeyTest.java b/solr/core/src/test/org/apache/solr/core/QueryResultKeyTest.java index dab6f5087ab..f89e1b185dd 100644 --- a/solr/core/src/test/org/apache/solr/core/QueryResultKeyTest.java +++ b/solr/core/src/test/org/apache/solr/core/QueryResultKeyTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.core; import java.util.Arrays; diff --git a/solr/core/src/test/org/apache/solr/core/RAMDirectoryFactoryTest.java b/solr/core/src/test/org/apache/solr/core/RAMDirectoryFactoryTest.java index aa30b613140..2bc668ea8c3 100644 --- a/solr/core/src/test/org/apache/solr/core/RAMDirectoryFactoryTest.java +++ b/solr/core/src/test/org/apache/solr/core/RAMDirectoryFactoryTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.core; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/core/RequestHandlersTest.java b/solr/core/src/test/org/apache/solr/core/RequestHandlersTest.java index 6d855dde1b0..ca45f7cdd86 100644 --- a/solr/core/src/test/org/apache/solr/core/RequestHandlersTest.java +++ b/solr/core/src/test/org/apache/solr/core/RequestHandlersTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.core; import org.apache.solr.SolrTestCaseJ4; diff --git a/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java b/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java index decb9d2f4a3..8ab9606a7b8 100644 --- a/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java +++ b/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.core; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/core/SOLR749Test.java b/solr/core/src/test/org/apache/solr/core/SOLR749Test.java index d3d0dcbb573..446c5062f17 100644 --- a/solr/core/src/test/org/apache/solr/core/SOLR749Test.java +++ b/solr/core/src/test/org/apache/solr/core/SOLR749Test.java @@ -1,4 +1,3 @@ -package org.apache.solr.core; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.core; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.core; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.search.QParserPlugin; import org.apache.solr.search.FooQParserPlugin; diff --git a/solr/core/src/test/org/apache/solr/core/SolrCoreCheckLockOnStartupTest.java b/solr/core/src/test/org/apache/solr/core/SolrCoreCheckLockOnStartupTest.java index 1c1fb44c6e8..6867d74712f 100644 --- a/solr/core/src/test/org/apache/solr/core/SolrCoreCheckLockOnStartupTest.java +++ b/solr/core/src/test/org/apache/solr/core/SolrCoreCheckLockOnStartupTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.core; - /* * 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.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.core; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; diff --git a/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java b/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java index 224bd835ae8..54827079204 100644 --- a/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java +++ b/solr/core/src/test/org/apache/solr/core/SolrCoreTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.core; import org.apache.solr.SolrTestCaseJ4; diff --git a/solr/core/src/test/org/apache/solr/core/TestBadConfig.java b/solr/core/src/test/org/apache/solr/core/TestBadConfig.java index 07d2e69c80e..5d335b6b283 100644 --- a/solr/core/src/test/org/apache/solr/core/TestBadConfig.java +++ b/solr/core/src/test/org/apache/solr/core/TestBadConfig.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.core; import javax.script.ScriptEngineManager; diff --git a/solr/core/src/test/org/apache/solr/core/TestCodecSupport.java b/solr/core/src/test/org/apache/solr/core/TestCodecSupport.java index a4c824bed7e..a1718e65d5c 100644 --- a/solr/core/src/test/org/apache/solr/core/TestCodecSupport.java +++ b/solr/core/src/test/org/apache/solr/core/TestCodecSupport.java @@ -1,5 +1,3 @@ -package org.apache.solr.core; - /* * 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.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.core; import java.io.IOException; import java.util.Map; diff --git a/solr/core/src/test/org/apache/solr/core/TestConfig.java b/solr/core/src/test/org/apache/solr/core/TestConfig.java index d115b61ca51..128c8c63211 100644 --- a/solr/core/src/test/org/apache/solr/core/TestConfig.java +++ b/solr/core/src/test/org/apache/solr/core/TestConfig.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.core; import javax.xml.xpath.XPathConstants; diff --git a/solr/core/src/test/org/apache/solr/core/TestConfigOverlay.java b/solr/core/src/test/org/apache/solr/core/TestConfigOverlay.java index 897ced89ea1..633dde3552d 100644 --- a/solr/core/src/test/org/apache/solr/core/TestConfigOverlay.java +++ b/solr/core/src/test/org/apache/solr/core/TestConfigOverlay.java @@ -1,5 +1,3 @@ -package org.apache.solr.core; - /* * 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.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.core; import java.util.Collections; import java.util.Map; diff --git a/solr/core/src/test/org/apache/solr/core/TestConfigSetImmutable.java b/solr/core/src/test/org/apache/solr/core/TestConfigSetImmutable.java index 6347ae1eafd..7c47ab1c998 100644 --- a/solr/core/src/test/org/apache/solr/core/TestConfigSetImmutable.java +++ b/solr/core/src/test/org/apache/solr/core/TestConfigSetImmutable.java @@ -1,5 +1,3 @@ -package org.apache.solr.core; - /* * 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.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.core; import java.io.File; import java.io.StringReader; diff --git a/solr/core/src/test/org/apache/solr/core/TestConfigSetProperties.java b/solr/core/src/test/org/apache/solr/core/TestConfigSetProperties.java index fd5e745f4b0..4c227711daf 100644 --- a/solr/core/src/test/org/apache/solr/core/TestConfigSetProperties.java +++ b/solr/core/src/test/org/apache/solr/core/TestConfigSetProperties.java @@ -1,5 +1,3 @@ -package org.apache.solr.core; - /* * 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.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.core; import java.nio.charset.StandardCharsets; import java.nio.file.Files; diff --git a/solr/core/src/test/org/apache/solr/core/TestConfigSets.java b/solr/core/src/test/org/apache/solr/core/TestConfigSets.java index 6365f842a4e..ae11fd67466 100644 --- a/solr/core/src/test/org/apache/solr/core/TestConfigSets.java +++ b/solr/core/src/test/org/apache/solr/core/TestConfigSets.java @@ -1,5 +1,3 @@ -package org.apache.solr.core; - /* * 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.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.core; import java.io.File; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java b/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java index 3cc5ab547ed..44f9e5c3c14 100644 --- a/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java +++ b/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.core; import java.io.File; diff --git a/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java b/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java index 286a53dc13f..fa07de8795f 100644 --- a/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java +++ b/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java @@ -1,5 +1,3 @@ -package org.apache.solr.core; - /* * 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.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.core; import java.io.File; import java.io.FileOutputStream; diff --git a/solr/core/src/test/org/apache/solr/core/TestDynamicLoading.java b/solr/core/src/test/org/apache/solr/core/TestDynamicLoading.java index 9fdaa8d69d6..c8b46306fc2 100644 --- a/solr/core/src/test/org/apache/solr/core/TestDynamicLoading.java +++ b/solr/core/src/test/org/apache/solr/core/TestDynamicLoading.java @@ -1,5 +1,3 @@ -package org.apache.solr.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,7 +14,7 @@ package org.apache.solr.core; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.core; import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.impl.HttpSolrClient; diff --git a/solr/core/src/test/org/apache/solr/core/TestImplicitCoreProperties.java b/solr/core/src/test/org/apache/solr/core/TestImplicitCoreProperties.java index b38ec0681b9..3c3d61abeae 100644 --- a/solr/core/src/test/org/apache/solr/core/TestImplicitCoreProperties.java +++ b/solr/core/src/test/org/apache/solr/core/TestImplicitCoreProperties.java @@ -1,24 +1,24 @@ +/* + * 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.core; import org.apache.solr.SolrTestCaseJ4; import org.junit.Test; -/* - * 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 TestImplicitCoreProperties extends SolrTestCaseJ4 { @Test diff --git a/solr/core/src/test/org/apache/solr/core/TestInfoStreamLogging.java b/solr/core/src/test/org/apache/solr/core/TestInfoStreamLogging.java index 74b3f4be543..9b65f8c4811 100644 --- a/solr/core/src/test/org/apache/solr/core/TestInfoStreamLogging.java +++ b/solr/core/src/test/org/apache/solr/core/TestInfoStreamLogging.java @@ -1,5 +1,3 @@ -package org.apache.solr.core; - /* * 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.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.core; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.util.PrintStreamInfoStream; diff --git a/solr/core/src/test/org/apache/solr/core/TestInitParams.java b/solr/core/src/test/org/apache/solr/core/TestInitParams.java index ba7a8ccd327..465c1602790 100644 --- a/solr/core/src/test/org/apache/solr/core/TestInitParams.java +++ b/solr/core/src/test/org/apache/solr/core/TestInitParams.java @@ -1,5 +1,3 @@ -package org.apache.solr.core; - /* * 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.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.core; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.common.util.NamedList; diff --git a/solr/core/src/test/org/apache/solr/core/TestLazyCores.java b/solr/core/src/test/org/apache/solr/core/TestLazyCores.java index 4da2e50a99b..8ee4ec5763f 100644 --- a/solr/core/src/test/org/apache/solr/core/TestLazyCores.java +++ b/solr/core/src/test/org/apache/solr/core/TestLazyCores.java @@ -1,5 +1,3 @@ -package org.apache.solr.core; - /* * 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.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.core; import java.io.File; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java b/solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java index 7ab1e9f646f..5b2c9127338 100644 --- a/solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java +++ b/solr/core/src/test/org/apache/solr/core/TestMergePolicyConfig.java @@ -1,5 +1,3 @@ -package org.apache.solr.core; - /* * 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.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.core; import java.util.concurrent.atomic.AtomicInteger; diff --git a/solr/core/src/test/org/apache/solr/core/TestNRTOpen.java b/solr/core/src/test/org/apache/solr/core/TestNRTOpen.java index 11807fc9b4a..8c24d7760b1 100644 --- a/solr/core/src/test/org/apache/solr/core/TestNRTOpen.java +++ b/solr/core/src/test/org/apache/solr/core/TestNRTOpen.java @@ -1,5 +1,3 @@ -package org.apache.solr.core; - /* * 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.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.core; import java.io.File; import java.util.Collections; diff --git a/solr/core/src/test/org/apache/solr/core/TestQuerySenderListener.java b/solr/core/src/test/org/apache/solr/core/TestQuerySenderListener.java index ea9fa9ad875..8f895695592 100644 --- a/solr/core/src/test/org/apache/solr/core/TestQuerySenderListener.java +++ b/solr/core/src/test/org/apache/solr/core/TestQuerySenderListener.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.core; import org.apache.solr.SolrTestCaseJ4; diff --git a/solr/core/src/test/org/apache/solr/core/TestQuerySenderNoQuery.java b/solr/core/src/test/org/apache/solr/core/TestQuerySenderNoQuery.java index e200d0e602e..425f04a1402 100644 --- a/solr/core/src/test/org/apache/solr/core/TestQuerySenderNoQuery.java +++ b/solr/core/src/test/org/apache/solr/core/TestQuerySenderNoQuery.java @@ -1,5 +1,3 @@ -package org.apache.solr.core; - /* * 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.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.core; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.search.SolrIndexSearcher; diff --git a/solr/core/src/test/org/apache/solr/core/TestReloadAndDeleteDocs.java b/solr/core/src/test/org/apache/solr/core/TestReloadAndDeleteDocs.java index d22c4379852..5d74c9e4e7c 100644 --- a/solr/core/src/test/org/apache/solr/core/TestReloadAndDeleteDocs.java +++ b/solr/core/src/test/org/apache/solr/core/TestReloadAndDeleteDocs.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.core; import org.apache.solr.SolrTestCaseJ4; diff --git a/solr/core/src/test/org/apache/solr/core/TestShardHandlerFactory.java b/solr/core/src/test/org/apache/solr/core/TestShardHandlerFactory.java index f156c4431c8..e6e62956372 100644 --- a/solr/core/src/test/org/apache/solr/core/TestShardHandlerFactory.java +++ b/solr/core/src/test/org/apache/solr/core/TestShardHandlerFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.core; import java.nio.file.Path; diff --git a/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java b/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java index 0f1dff68b40..6aa54da78e4 100644 --- a/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java +++ b/solr/core/src/test/org/apache/solr/core/TestSolrConfigHandler.java @@ -1,5 +1,3 @@ -package org.apache.solr.core; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,7 +14,7 @@ package org.apache.solr.core; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.core; import java.io.File; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/core/TestSolrIndexConfig.java b/solr/core/src/test/org/apache/solr/core/TestSolrIndexConfig.java index 0d2613fde81..6416639dd86 100644 --- a/solr/core/src/test/org/apache/solr/core/TestSolrIndexConfig.java +++ b/solr/core/src/test/org/apache/solr/core/TestSolrIndexConfig.java @@ -1,5 +1,3 @@ -package org.apache.solr.core; - /* * 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.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.core; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; diff --git a/solr/core/src/test/org/apache/solr/core/TestSolrXml.java b/solr/core/src/test/org/apache/solr/core/TestSolrXml.java index bcf874e80a8..a6cccbc4c9d 100644 --- a/solr/core/src/test/org/apache/solr/core/TestSolrXml.java +++ b/solr/core/src/test/org/apache/solr/core/TestSolrXml.java @@ -1,5 +1,3 @@ -package org.apache.solr.core; - /* * 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.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.core; import java.io.File; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/core/TestXIncludeConfig.java b/solr/core/src/test/org/apache/solr/core/TestXIncludeConfig.java index e78be2f6c67..86ef0b13a68 100644 --- a/solr/core/src/test/org/apache/solr/core/TestXIncludeConfig.java +++ b/solr/core/src/test/org/apache/solr/core/TestXIncludeConfig.java @@ -1,5 +1,3 @@ -package org.apache.solr.core; - /* * 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.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.core; import javax.xml.parsers.DocumentBuilderFactory; diff --git a/solr/core/src/test/org/apache/solr/handler/AnalysisRequestHandlerTestBase.java b/solr/core/src/test/org/apache/solr/handler/AnalysisRequestHandlerTestBase.java index 071f9712c1a..d5f84921d84 100644 --- a/solr/core/src/test/org/apache/solr/handler/AnalysisRequestHandlerTestBase.java +++ b/solr/core/src/test/org/apache/solr/handler/AnalysisRequestHandlerTestBase.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler; import org.apache.solr.SolrTestCaseJ4; diff --git a/solr/core/src/test/org/apache/solr/handler/CSVRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/CSVRequestHandlerTest.java index 05d260dbbb8..4bf8bb61862 100644 --- a/solr/core/src/test/org/apache/solr/handler/CSVRequestHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/handler/CSVRequestHandlerTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler; import org.apache.solr.SolrTestCaseJ4; diff --git a/solr/core/src/test/org/apache/solr/handler/CheckBackupStatus.java b/solr/core/src/test/org/apache/solr/handler/CheckBackupStatus.java index 669ac2a3c53..ab1d553abcd 100644 --- a/solr/core/src/test/org/apache/solr/handler/CheckBackupStatus.java +++ b/solr/core/src/test/org/apache/solr/handler/CheckBackupStatus.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 @@ -16,6 +14,7 @@ package org.apache.solr.handler; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler; import java.io.IOException; import java.util.regex.Matcher; diff --git a/solr/core/src/test/org/apache/solr/handler/DocumentAnalysisRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/DocumentAnalysisRequestHandlerTest.java index c68fb718d79..d3b0ab0e78f 100644 --- a/solr/core/src/test/org/apache/solr/handler/DocumentAnalysisRequestHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/handler/DocumentAnalysisRequestHandlerTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler; import org.apache.lucene.analysis.MockTokenizer; diff --git a/solr/core/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java index 7ded1bbf59a..f56b656cdb9 100644 --- a/solr/core/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler; import org.apache.lucene.analysis.Analyzer; diff --git a/solr/core/src/test/org/apache/solr/handler/JsonLoaderTest.java b/solr/core/src/test/org/apache/solr/handler/JsonLoaderTest.java index 7a51d5ba8c0..f2316da9f1d 100644 --- a/solr/core/src/test/org/apache/solr/handler/JsonLoaderTest.java +++ b/solr/core/src/test/org/apache/solr/handler/JsonLoaderTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler; import org.apache.solr.SolrTestCaseJ4; diff --git a/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java index 794d82c2cc2..8e9c17016d1 100644 --- a/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler; import java.util.ArrayList; diff --git a/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java index 136362b9544..7a3a6407f0a 100644 --- a/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/handler/PingRequestHandlerTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler; import java.io.File; diff --git a/solr/core/src/test/org/apache/solr/handler/RequestLoggingTest.java b/solr/core/src/test/org/apache/solr/handler/RequestLoggingTest.java index c49c26391f2..4c780ccda49 100644 --- a/solr/core/src/test/org/apache/solr/handler/RequestLoggingTest.java +++ b/solr/core/src/test/org/apache/solr/handler/RequestLoggingTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.handler; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler; import java.io.StringWriter; import java.util.regex.Matcher; diff --git a/solr/core/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java index c32b6faffbe..45e0e00a418 100644 --- a/solr/core/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/handler/StandardRequestHandlerTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler; import java.util.HashMap; diff --git a/solr/core/src/test/org/apache/solr/handler/TestBlobHandler.java b/solr/core/src/test/org/apache/solr/handler/TestBlobHandler.java index c4ef8401573..bd7f3147e67 100644 --- a/solr/core/src/test/org/apache/solr/handler/TestBlobHandler.java +++ b/solr/core/src/test/org/apache/solr/handler/TestBlobHandler.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 @@ -16,6 +14,7 @@ package org.apache.solr.handler; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; diff --git a/solr/core/src/test/org/apache/solr/handler/TestCSVLoader.java b/solr/core/src/test/org/apache/solr/handler/TestCSVLoader.java index 2353e2b9f42..36adb1439ff 100644 --- a/solr/core/src/test/org/apache/solr/handler/TestCSVLoader.java +++ b/solr/core/src/test/org/apache/solr/handler/TestCSVLoader.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler; import org.apache.lucene.util.TestUtil; diff --git a/solr/core/src/test/org/apache/solr/handler/TestConfigReload.java b/solr/core/src/test/org/apache/solr/handler/TestConfigReload.java index 285c37b768f..3d89c4dd6f4 100644 --- a/solr/core/src/test/org/apache/solr/handler/TestConfigReload.java +++ b/solr/core/src/test/org/apache/solr/handler/TestConfigReload.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 @@ -16,6 +14,7 @@ package org.apache.solr.handler; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler; import static java.util.Arrays.asList; import static org.apache.solr.common.util.Utils.getObjectByPath; diff --git a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerBackup.java b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerBackup.java index 84fca530b23..83f4b41a5d7 100644 --- a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerBackup.java +++ b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandlerBackup.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 @@ -16,6 +14,7 @@ package org.apache.solr.handler; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler; import java.io.File; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/handler/TestReqParamsAPI.java b/solr/core/src/test/org/apache/solr/handler/TestReqParamsAPI.java index 9827fc05360..51f91337357 100644 --- a/solr/core/src/test/org/apache/solr/handler/TestReqParamsAPI.java +++ b/solr/core/src/test/org/apache/solr/handler/TestReqParamsAPI.java @@ -1,3 +1,19 @@ +/* + * 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.handler; import java.util.ArrayList; @@ -22,23 +38,6 @@ import org.junit.Test; import static java.util.Arrays.asList; import static org.apache.solr.handler.TestSolrConfigHandlerCloud.compareValues; -/* - * 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. - */ - @LuceneTestCase.BadApple(bugUrl = "https://issues.apache.org/jira/browse/SOLR-7362") public class TestReqParamsAPI extends AbstractFullDistribZkTestBase { private List restTestHarnesses = new ArrayList<>(); diff --git a/solr/core/src/test/org/apache/solr/handler/TestRestoreCore.java b/solr/core/src/test/org/apache/solr/handler/TestRestoreCore.java index 00eb43f789f..d89b2179788 100644 --- a/solr/core/src/test/org/apache/solr/handler/TestRestoreCore.java +++ b/solr/core/src/test/org/apache/solr/handler/TestRestoreCore.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 @@ -16,7 +14,7 @@ package org.apache.solr.handler; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.handler; import java.io.File; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java b/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java index 5a879078c45..e376c18a45f 100644 --- a/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java +++ b/solr/core/src/test/org/apache/solr/handler/TestSQLHandler.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 @@ -16,6 +14,7 @@ package org.apache.solr.handler; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler; import java.io.IOException; import java.util.ArrayList; diff --git a/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerCloud.java b/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerCloud.java index 91366276b9d..ea6eb52aa5e 100644 --- a/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerCloud.java +++ b/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerCloud.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 @@ -16,7 +14,7 @@ package org.apache.solr.handler; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.handler; import java.util.ArrayList; import java.util.Arrays; diff --git a/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.java b/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.java index e6e6cffa467..4f3756865ac 100644 --- a/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.java +++ b/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.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 @@ -16,6 +14,7 @@ package org.apache.solr.handler; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler; import static java.util.Arrays.asList; import static org.apache.solr.common.util.Utils.getObjectByPath; diff --git a/solr/core/src/test/org/apache/solr/handler/ThrowErrorOnInitRequestHandler.java b/solr/core/src/test/org/apache/solr/handler/ThrowErrorOnInitRequestHandler.java index 60caa30aa2b..f0748b19157 100644 --- a/solr/core/src/test/org/apache/solr/handler/ThrowErrorOnInitRequestHandler.java +++ b/solr/core/src/test/org/apache/solr/handler/ThrowErrorOnInitRequestHandler.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.java b/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.java index e9e1938801b..cf41dc5a9a3 100644 --- a/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.java +++ b/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminCreateDiscoverTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.admin; import java.io.File; diff --git a/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java index ebcb310b7af..bbdd1a3b429 100644 --- a/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.admin; import java.io.File; diff --git a/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminRequestStatusTest.java b/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminRequestStatusTest.java index 70df29eac73..9c7ce70cdaf 100644 --- a/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminRequestStatusTest.java +++ b/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminRequestStatusTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.admin; - /* * 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.handler.admin; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.admin; import java.io.File; import java.nio.file.Files; diff --git a/solr/core/src/test/org/apache/solr/handler/admin/CoreMergeIndexesAdminHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/CoreMergeIndexesAdminHandlerTest.java index 5270344ddd2..c6f952069ce 100644 --- a/solr/core/src/test/org/apache/solr/handler/admin/CoreMergeIndexesAdminHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/handler/admin/CoreMergeIndexesAdminHandlerTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.admin; - /* * 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.handler.admin; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.admin; import java.io.File; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/handler/admin/InfoHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/InfoHandlerTest.java index 6ac9d8637c4..d4ae0de8b56 100644 --- a/solr/core/src/test/org/apache/solr/handler/admin/InfoHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/handler/admin/InfoHandlerTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.admin; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/handler/admin/LoggingHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/LoggingHandlerTest.java index 08196b26e4d..555c1376a50 100644 --- a/solr/core/src/test/org/apache/solr/handler/admin/LoggingHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/handler/admin/LoggingHandlerTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.admin; import org.apache.log4j.Level; diff --git a/solr/core/src/test/org/apache/solr/handler/admin/LukeRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/LukeRequestHandlerTest.java index b16e45fbd8d..66c378d4a92 100644 --- a/solr/core/src/test/org/apache/solr/handler/admin/LukeRequestHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/handler/admin/LukeRequestHandlerTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.admin; import org.apache.solr.common.luke.FieldFlag; diff --git a/solr/core/src/test/org/apache/solr/handler/admin/MBeansHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/MBeansHandlerTest.java index 3e3ce86b77f..7169888e3fc 100644 --- a/solr/core/src/test/org/apache/solr/handler/admin/MBeansHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/handler/admin/MBeansHandlerTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.admin; import java.util.ArrayList; diff --git a/solr/core/src/test/org/apache/solr/handler/admin/SecurityConfHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/SecurityConfHandlerTest.java index 8afbbe238c0..a857e770b50 100644 --- a/solr/core/src/test/org/apache/solr/handler/admin/SecurityConfHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/handler/admin/SecurityConfHandlerTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.admin; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,7 +14,7 @@ package org.apache.solr.handler.admin; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.handler.admin; import java.nio.charset.StandardCharsets; import java.util.Collections; diff --git a/solr/core/src/test/org/apache/solr/handler/admin/SegmentsInfoRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/SegmentsInfoRequestHandlerTest.java index 3c9441d0244..50333a21d2c 100644 --- a/solr/core/src/test/org/apache/solr/handler/admin/SegmentsInfoRequestHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/handler/admin/SegmentsInfoRequestHandlerTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.admin; - /* * 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.handler.admin; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.admin; import org.apache.solr.util.AbstractSolrTestCase; import org.junit.Before; diff --git a/solr/core/src/test/org/apache/solr/handler/admin/ShowFileRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/ShowFileRequestHandlerTest.java index 108bc4a3446..25dbac6fd7c 100644 --- a/solr/core/src/test/org/apache/solr/handler/admin/ShowFileRequestHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/handler/admin/ShowFileRequestHandlerTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.admin; - /* * 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.handler.admin; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.admin; import org.apache.solr.SolrJettyTestBase; import org.apache.solr.client.solrj.ResponseParser; diff --git a/solr/core/src/test/org/apache/solr/handler/admin/SystemInfoHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/SystemInfoHandlerTest.java index ebc5879daf4..c961a55c5f5 100644 --- a/solr/core/src/test/org/apache/solr/handler/admin/SystemInfoHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/handler/admin/SystemInfoHandlerTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.admin; import java.lang.management.ManagementFactory; diff --git a/solr/core/src/test/org/apache/solr/handler/component/BadComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/BadComponentTest.java index 17361e0eb2f..6de1dd6c208 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/BadComponentTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/BadComponentTest.java @@ -1,6 +1,3 @@ -package org.apache.solr.handler.component; - - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +14,8 @@ package org.apache.solr.handler.component; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.component; + import org.apache.solr.SolrTestCaseJ4; import org.junit.Test; diff --git a/solr/core/src/test/org/apache/solr/handler/component/DebugComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/DebugComponentTest.java index 4cbd75c7fa4..130f1ef1af9 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/DebugComponentTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/DebugComponentTest.java @@ -1,4 +1,3 @@ -package org.apache.solr.handler.component; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.handler.component; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.handler.component; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java index 4242d64fde4..16a3e875058 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java @@ -1,3 +1,19 @@ +/* + * 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.handler.component; import org.apache.commons.io.FileUtils; @@ -29,23 +45,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -/* - * 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 DistributedDebugComponentTest extends SolrJettyTestBase { private static SolrClient collection1; diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedExpandComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedExpandComponentTest.java index 03275acaacb..c94f79fee1d 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/DistributedExpandComponentTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedExpandComponentTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.component; - /* * 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.handler.component; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.component; import org.apache.solr.BaseDistributedSearchTestCase; import org.apache.solr.client.solrj.response.QueryResponse; diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLargeTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLargeTest.java index 0843bbfc2e1..176b57f5e0b 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLargeTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLargeTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.component; - /* * 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.handler.component; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.component; import java.io.IOException; import java.util.Date; diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLongTailTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLongTailTest.java index 350a4f7f9e7..52f1825ae4e 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLongTailTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotLongTailTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.component; - /* * 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.handler.component; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.component; import java.util.List; diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotSmallAdvancedTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotSmallAdvancedTest.java index 09916204045..1ed60e4a919 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotSmallAdvancedTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotSmallAdvancedTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.component; - /* * 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.handler.component; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.component; import org.apache.solr.BaseDistributedSearchTestCase; import org.apache.solr.client.solrj.SolrClient; diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotSmallTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotSmallTest.java index 4808dc48e36..fc7af80dd60 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotSmallTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotSmallTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.component; - /* * 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.handler.component; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.component; import java.util.ArrayList; import java.util.Collections; diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotWhiteBoxTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotWhiteBoxTest.java index 8fbfe5a366f..a824c9d0407 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotWhiteBoxTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedFacetPivotWhiteBoxTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.component; - /* * 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.handler.component; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.component; import org.apache.solr.BaseDistributedSearchTestCase; import org.apache.solr.client.solrj.response.PivotField; diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedMLTComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedMLTComponentTest.java index f67d43d18d4..64f0e38840a 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/DistributedMLTComponentTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedMLTComponentTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.component; - /* * 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.handler.component; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.component; import java.util.HashMap; import java.util.Map; diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentCustomSortTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentCustomSortTest.java index 20a57dbaba0..9e9401b8d18 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentCustomSortTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentCustomSortTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.component; - /* * 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.handler.component; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.component; import org.apache.solr.BaseDistributedSearchTestCase; import org.apache.solr.client.solrj.response.QueryResponse; diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentOptimizationTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentOptimizationTest.java index 6887ef8b551..e4722d77554 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentOptimizationTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentOptimizationTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.component; - /* * 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.handler.component; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.component; import org.apache.solr.client.solrj.response.QueryResponse; import org.apache.solr.cloud.AbstractFullDistribZkTestBase; diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java index 68d06ac588f..0c18b25fc24 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryElevationComponentTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.component; - /* * 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.handler.component; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.component; import java.io.File; diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java index dad78d1ad4b..40e952abb67 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.component; - /* * 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.handler.component; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.component; import java.util.ArrayList; import java.util.Arrays; diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedSuggestComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedSuggestComponentTest.java index 7f08ecbb7a9..57018418bc4 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/DistributedSuggestComponentTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedSuggestComponentTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.component; - /* * 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.handler.component; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.component; import java.util.ArrayList; import java.util.Arrays; diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedTermsComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedTermsComponentTest.java index ef097601082..bcd2f258f39 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/DistributedTermsComponentTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedTermsComponentTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.component; - /* * 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.handler.component; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.component; import org.apache.solr.BaseDistributedSearchTestCase; import org.junit.Test; diff --git a/solr/core/src/test/org/apache/solr/handler/component/DummyCustomParamSpellChecker.java b/solr/core/src/test/org/apache/solr/handler/component/DummyCustomParamSpellChecker.java index d107e9a3d30..30924c313a0 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/DummyCustomParamSpellChecker.java +++ b/solr/core/src/test/org/apache/solr/handler/component/DummyCustomParamSpellChecker.java @@ -1,17 +1,3 @@ -package org.apache.solr.handler.component; - -import org.apache.lucene.analysis.Token; -import org.apache.solr.core.SolrCore; -import org.apache.solr.search.SolrIndexSearcher; -import org.apache.solr.spelling.SolrSpellChecker; -import org.apache.solr.spelling.SpellingOptions; -import org.apache.solr.spelling.SpellingResult; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -28,8 +14,20 @@ import java.util.List; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.component; +import org.apache.lucene.analysis.Token; +import org.apache.solr.core.SolrCore; +import org.apache.solr.search.SolrIndexSearcher; +import org.apache.solr.spelling.SolrSpellChecker; +import org.apache.solr.spelling.SpellingOptions; +import org.apache.solr.spelling.SpellingResult; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; /** * A Dummy SpellChecker for testing purposes * diff --git a/solr/core/src/test/org/apache/solr/handler/component/FacetPivotSmallTest.java b/solr/core/src/test/org/apache/solr/handler/component/FacetPivotSmallTest.java index adea53eb715..ce708a67d00 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/FacetPivotSmallTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/FacetPivotSmallTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.component; - /* * 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.handler.component; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.component; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.common.params.FacetParams; diff --git a/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java index 9ab239f1ff6..f11300432c4 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.component; import org.apache.lucene.index.IndexReader; diff --git a/solr/core/src/test/org/apache/solr/handler/component/ResponseLogComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/ResponseLogComponentTest.java index 7f9a041d4ba..7e309fc894b 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/ResponseLogComponentTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/ResponseLogComponentTest.java @@ -1,12 +1,3 @@ -package org.apache.solr.handler.component; - -import org.apache.solr.SolrTestCaseJ4; -import org.apache.solr.common.util.NamedList; -import org.apache.solr.request.SolrQueryRequest; -import org.apache.solr.response.SolrQueryResponse; -import org.junit.BeforeClass; -import org.junit.Test; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -23,6 +14,14 @@ import org.junit.Test; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.component; + +import org.apache.solr.SolrTestCaseJ4; +import org.apache.solr.common.util.NamedList; +import org.apache.solr.request.SolrQueryRequest; +import org.apache.solr.response.SolrQueryResponse; +import org.junit.BeforeClass; +import org.junit.Test; public class ResponseLogComponentTest extends SolrTestCaseJ4 { diff --git a/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java index 0e49f11f8dc..f35754bb3bc 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/SearchHandlerTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.component; import java.util.ArrayList; diff --git a/solr/core/src/test/org/apache/solr/handler/component/SpatialHeatmapFacetsTest.java b/solr/core/src/test/org/apache/solr/handler/component/SpatialHeatmapFacetsTest.java index 3ca6e047e49..78dd919514f 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/SpatialHeatmapFacetsTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/SpatialHeatmapFacetsTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.component; - /* * 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.handler.component; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.component; import java.util.Arrays; import java.util.List; diff --git a/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java index b2cda00b492..0e11d4453e6 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.component; import java.io.File; diff --git a/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java index f05085c1963..36c7a51c56d 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java @@ -1,4 +1,3 @@ -package org.apache.solr.handler.component; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.handler.component; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.handler.component; import java.nio.ByteBuffer; import java.text.DateFormat; import java.text.SimpleDateFormat; diff --git a/solr/core/src/test/org/apache/solr/handler/component/SuggestComponentContextFilterQueryTest.java b/solr/core/src/test/org/apache/solr/handler/component/SuggestComponentContextFilterQueryTest.java index 3045c661a83..e22e995ddd2 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/SuggestComponentContextFilterQueryTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/SuggestComponentContextFilterQueryTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.component; - /* * 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.handler.component; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.component; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.spelling.suggest.SuggesterParams; diff --git a/solr/core/src/test/org/apache/solr/handler/component/SuggestComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/SuggestComponentTest.java index 1ba2e8281f3..ed7a9e77af8 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/SuggestComponentTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/SuggestComponentTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.component; - /* * 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.handler.component; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.component; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.common.SolrException; diff --git a/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentDistributedTest.java b/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentDistributedTest.java index 457357377d6..5d7ff9ad534 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentDistributedTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentDistributedTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.handler.component; import org.apache.lucene.util.Constants; diff --git a/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java index 35a699fa751..abee4bd3439 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java @@ -1,13 +1,3 @@ -package org.apache.solr.handler.component; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import org.apache.solr.SolrTestCaseJ4; -import org.apache.solr.common.params.TermVectorParams; -import org.junit.BeforeClass; -import org.junit.Test; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -24,8 +14,16 @@ import org.junit.Test; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.component; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import org.apache.solr.SolrTestCaseJ4; +import org.apache.solr.common.params.TermVectorParams; +import org.junit.BeforeClass; +import org.junit.Test; /** * * diff --git a/solr/core/src/test/org/apache/solr/handler/component/TermsComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/TermsComponentTest.java index 34d88e9d0d6..934a6324e02 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/TermsComponentTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/TermsComponentTest.java @@ -1,4 +1,3 @@ -package org.apache.solr.handler.component; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.handler.component; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.handler.component; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.common.params.ModifiableSolrParams; import org.apache.solr.common.params.TermsParams; diff --git a/solr/core/src/test/org/apache/solr/handler/component/TestDistributedStatsComponentCardinality.java b/solr/core/src/test/org/apache/solr/handler/component/TestDistributedStatsComponentCardinality.java index 40222d014cf..0ba9978e7f8 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/TestDistributedStatsComponentCardinality.java +++ b/solr/core/src/test/org/apache/solr/handler/component/TestDistributedStatsComponentCardinality.java @@ -1,7 +1,3 @@ -package org.apache.solr.handler.component; - -import java.lang.invoke.MethodHandles; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import java.lang.invoke.MethodHandles; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.component; + +import java.lang.invoke.MethodHandles; import java.util.Arrays; import java.util.Collections; diff --git a/solr/core/src/test/org/apache/solr/handler/component/TestExpandComponent.java b/solr/core/src/test/org/apache/solr/handler/component/TestExpandComponent.java index 23281adda62..cda4058e117 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/TestExpandComponent.java +++ b/solr/core/src/test/org/apache/solr/handler/component/TestExpandComponent.java @@ -1,20 +1,19 @@ /* -* 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. -*/ - + * 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.handler.component; import org.apache.solr.SolrTestCaseJ4; diff --git a/solr/core/src/test/org/apache/solr/handler/component/TestPivotHelperCode.java b/solr/core/src/test/org/apache/solr/handler/component/TestPivotHelperCode.java index e772ba19e29..8d9a2bdc0c9 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/TestPivotHelperCode.java +++ b/solr/core/src/test/org/apache/solr/handler/component/TestPivotHelperCode.java @@ -1,6 +1,3 @@ -package org.apache.solr.handler.component; - - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +14,8 @@ package org.apache.solr.handler.component; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.component; + import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.handler.component.PivotFacetField; diff --git a/solr/core/src/test/org/apache/solr/handler/component/TestTrackingShardHandlerFactory.java b/solr/core/src/test/org/apache/solr/handler/component/TestTrackingShardHandlerFactory.java index 28b8a795627..5b95981ed25 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/TestTrackingShardHandlerFactory.java +++ b/solr/core/src/test/org/apache/solr/handler/component/TestTrackingShardHandlerFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.component; - /* * 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.handler.component; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.component; import java.util.ArrayList; import java.util.List; diff --git a/solr/core/src/test/org/apache/solr/handler/loader/JavabinLoaderTest.java b/solr/core/src/test/org/apache/solr/handler/loader/JavabinLoaderTest.java index b6377799e56..6e988879574 100644 --- a/solr/core/src/test/org/apache/solr/handler/loader/JavabinLoaderTest.java +++ b/solr/core/src/test/org/apache/solr/handler/loader/JavabinLoaderTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.loader; - /* * 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.handler.loader; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.loader; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/highlight/FastVectorHighlighterTest.java b/solr/core/src/test/org/apache/solr/highlight/FastVectorHighlighterTest.java index 27dc3914521..1d61c089d29 100644 --- a/solr/core/src/test/org/apache/solr/highlight/FastVectorHighlighterTest.java +++ b/solr/core/src/test/org/apache/solr/highlight/FastVectorHighlighterTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.highlight; import java.util.HashMap; diff --git a/solr/core/src/test/org/apache/solr/highlight/HighlighterMaxOffsetTest.java b/solr/core/src/test/org/apache/solr/highlight/HighlighterMaxOffsetTest.java index 48291b5ed59..60c11f1eed8 100644 --- a/solr/core/src/test/org/apache/solr/highlight/HighlighterMaxOffsetTest.java +++ b/solr/core/src/test/org/apache/solr/highlight/HighlighterMaxOffsetTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.highlight; - /* * 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.highlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.highlight; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.request.SolrQueryRequest; diff --git a/solr/core/src/test/org/apache/solr/highlight/HighlighterTest.java b/solr/core/src/test/org/apache/solr/highlight/HighlighterTest.java index 1519c7f4cc7..1a432db20f5 100644 --- a/solr/core/src/test/org/apache/solr/highlight/HighlighterTest.java +++ b/solr/core/src/test/org/apache/solr/highlight/HighlighterTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.highlight; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/highlight/TestPostingsSolrHighlighter.java b/solr/core/src/test/org/apache/solr/highlight/TestPostingsSolrHighlighter.java index 157ca6af749..08748e4b244 100644 --- a/solr/core/src/test/org/apache/solr/highlight/TestPostingsSolrHighlighter.java +++ b/solr/core/src/test/org/apache/solr/highlight/TestPostingsSolrHighlighter.java @@ -1,5 +1,3 @@ -package org.apache.solr.highlight; - /* * 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.highlight; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.highlight; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.handler.component.HighlightComponent; diff --git a/solr/core/src/test/org/apache/solr/index/hdfs/CheckHdfsIndexTest.java b/solr/core/src/test/org/apache/solr/index/hdfs/CheckHdfsIndexTest.java index 1d326bcb95f..0ef3bf89d99 100644 --- a/solr/core/src/test/org/apache/solr/index/hdfs/CheckHdfsIndexTest.java +++ b/solr/core/src/test/org/apache/solr/index/hdfs/CheckHdfsIndexTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.index.hdfs; - /* * 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.index.hdfs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.index.hdfs; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/internal/csv/CSVParserTest.java b/solr/core/src/test/org/apache/solr/internal/csv/CSVParserTest.java index 0c64601d93e..54b0c614bf6 100644 --- a/solr/core/src/test/org/apache/solr/internal/csv/CSVParserTest.java +++ b/solr/core/src/test/org/apache/solr/internal/csv/CSVParserTest.java @@ -5,9 +5,9 @@ * 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 - * + * + * 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. diff --git a/solr/core/src/test/org/apache/solr/internal/csv/CSVPrinterTest.java b/solr/core/src/test/org/apache/solr/internal/csv/CSVPrinterTest.java index dd7bc02628b..6a9a8192e98 100644 --- a/solr/core/src/test/org/apache/solr/internal/csv/CSVPrinterTest.java +++ b/solr/core/src/test/org/apache/solr/internal/csv/CSVPrinterTest.java @@ -5,9 +5,9 @@ * 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 - * + * + * 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. diff --git a/solr/core/src/test/org/apache/solr/internal/csv/CSVStrategyTest.java b/solr/core/src/test/org/apache/solr/internal/csv/CSVStrategyTest.java index 383e764a56a..0a10d7f875f 100644 --- a/solr/core/src/test/org/apache/solr/internal/csv/CSVStrategyTest.java +++ b/solr/core/src/test/org/apache/solr/internal/csv/CSVStrategyTest.java @@ -5,9 +5,9 @@ * 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 - * + * + * 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. diff --git a/solr/core/src/test/org/apache/solr/internal/csv/CSVUtilsTest.java b/solr/core/src/test/org/apache/solr/internal/csv/CSVUtilsTest.java index 7b6682d7f64..7be19d34d17 100644 --- a/solr/core/src/test/org/apache/solr/internal/csv/CSVUtilsTest.java +++ b/solr/core/src/test/org/apache/solr/internal/csv/CSVUtilsTest.java @@ -5,9 +5,9 @@ * 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 - * + * + * 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. diff --git a/solr/core/src/test/org/apache/solr/internal/csv/CharBufferTest.java b/solr/core/src/test/org/apache/solr/internal/csv/CharBufferTest.java index d1ccce18582..ebde22861d6 100644 --- a/solr/core/src/test/org/apache/solr/internal/csv/CharBufferTest.java +++ b/solr/core/src/test/org/apache/solr/internal/csv/CharBufferTest.java @@ -1,20 +1,18 @@ /* - * 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 + * 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 + * 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. + * 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.internal.csv; diff --git a/solr/core/src/test/org/apache/solr/internal/csv/ExtendedBufferedReaderTest.java b/solr/core/src/test/org/apache/solr/internal/csv/ExtendedBufferedReaderTest.java index 636a0d5a045..8607e1c4d7a 100644 --- a/solr/core/src/test/org/apache/solr/internal/csv/ExtendedBufferedReaderTest.java +++ b/solr/core/src/test/org/apache/solr/internal/csv/ExtendedBufferedReaderTest.java @@ -5,9 +5,9 @@ * 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 - * + * + * 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. diff --git a/solr/core/src/test/org/apache/solr/internal/csv/writer/CSVConfigGuesserTest.java b/solr/core/src/test/org/apache/solr/internal/csv/writer/CSVConfigGuesserTest.java index 9135bc40533..7ece076664a 100644 --- a/solr/core/src/test/org/apache/solr/internal/csv/writer/CSVConfigGuesserTest.java +++ b/solr/core/src/test/org/apache/solr/internal/csv/writer/CSVConfigGuesserTest.java @@ -1,20 +1,18 @@ /* - * 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 + * 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 + * 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. + * 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.internal.csv.writer; diff --git a/solr/core/src/test/org/apache/solr/internal/csv/writer/CSVConfigTest.java b/solr/core/src/test/org/apache/solr/internal/csv/writer/CSVConfigTest.java index 8c4f6322819..67f376a431c 100644 --- a/solr/core/src/test/org/apache/solr/internal/csv/writer/CSVConfigTest.java +++ b/solr/core/src/test/org/apache/solr/internal/csv/writer/CSVConfigTest.java @@ -1,20 +1,18 @@ /* - * 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 + * 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 + * 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. + * 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.internal.csv.writer; diff --git a/solr/core/src/test/org/apache/solr/internal/csv/writer/CSVFieldTest.java b/solr/core/src/test/org/apache/solr/internal/csv/writer/CSVFieldTest.java index 98be118790c..0360d3acba9 100644 --- a/solr/core/src/test/org/apache/solr/internal/csv/writer/CSVFieldTest.java +++ b/solr/core/src/test/org/apache/solr/internal/csv/writer/CSVFieldTest.java @@ -1,20 +1,18 @@ /* - * 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 + * 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 + * 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. + * 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.internal.csv.writer; diff --git a/solr/core/src/test/org/apache/solr/internal/csv/writer/CSVWriterTest.java b/solr/core/src/test/org/apache/solr/internal/csv/writer/CSVWriterTest.java index f9f53782eae..16178e1bcd6 100644 --- a/solr/core/src/test/org/apache/solr/internal/csv/writer/CSVWriterTest.java +++ b/solr/core/src/test/org/apache/solr/internal/csv/writer/CSVWriterTest.java @@ -1,20 +1,18 @@ /* - * 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 + * 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 + * 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. + * 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.internal.csv.writer; diff --git a/solr/core/src/test/org/apache/solr/logging/TestLogWatcher.java b/solr/core/src/test/org/apache/solr/logging/TestLogWatcher.java index b85d0f3e7e7..6ae45186750 100644 --- a/solr/core/src/test/org/apache/solr/logging/TestLogWatcher.java +++ b/solr/core/src/test/org/apache/solr/logging/TestLogWatcher.java @@ -1,5 +1,3 @@ -package org.apache.solr.logging; - /* * 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.logging; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.logging; import org.apache.solr.common.SolrDocument; import org.apache.solr.common.SolrDocumentList; diff --git a/solr/core/src/test/org/apache/solr/request/JSONWriterTest.java b/solr/core/src/test/org/apache/solr/request/JSONWriterTest.java index 0edfb830606..9c4e2986767 100644 --- a/solr/core/src/test/org/apache/solr/request/JSONWriterTest.java +++ b/solr/core/src/test/org/apache/solr/request/JSONWriterTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.request; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java b/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java index 8d203c98243..15bb6f9eb9b 100644 --- a/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java +++ b/solr/core/src/test/org/apache/solr/request/SimpleFacetsTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.request; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/test/org/apache/solr/request/SmileWriterTest.java b/solr/core/src/test/org/apache/solr/request/SmileWriterTest.java index 08350894f87..7b6aff37d8f 100644 --- a/solr/core/src/test/org/apache/solr/request/SmileWriterTest.java +++ b/solr/core/src/test/org/apache/solr/request/SmileWriterTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.request; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,7 +14,7 @@ package org.apache.solr.request; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.request; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/solr/core/src/test/org/apache/solr/request/TestFaceting.java b/solr/core/src/test/org/apache/solr/request/TestFaceting.java index 46494a99929..00878b953bc 100644 --- a/solr/core/src/test/org/apache/solr/request/TestFaceting.java +++ b/solr/core/src/test/org/apache/solr/request/TestFaceting.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.request; import java.util.ArrayList; diff --git a/solr/core/src/test/org/apache/solr/request/TestIntervalFaceting.java b/solr/core/src/test/org/apache/solr/request/TestIntervalFaceting.java index 78d83ce5afd..8d68471ae54 100644 --- a/solr/core/src/test/org/apache/solr/request/TestIntervalFaceting.java +++ b/solr/core/src/test/org/apache/solr/request/TestIntervalFaceting.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.request; import org.apache.lucene.util.BytesRef; diff --git a/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java b/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java index 949ee5a7a59..16a8bf1e759 100644 --- a/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java +++ b/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java @@ -1,5 +1,3 @@ -package org.apache.solr.request; - /* * 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.request; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.request; import org.apache.commons.io.IOUtils; import org.apache.lucene.util.LuceneTestCase; diff --git a/solr/core/src/test/org/apache/solr/request/TestWriterPerf.java b/solr/core/src/test/org/apache/solr/request/TestWriterPerf.java index 3bffe13187d..9a5329d2ba3 100644 --- a/solr/core/src/test/org/apache/solr/request/TestWriterPerf.java +++ b/solr/core/src/test/org/apache/solr/request/TestWriterPerf.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.request; import java.io.ByteArrayInputStream; diff --git a/solr/core/src/test/org/apache/solr/request/macro/TestMacros.java b/solr/core/src/test/org/apache/solr/request/macro/TestMacros.java index 3f52a4feb0e..77d7d8c7021 100644 --- a/solr/core/src/test/org/apache/solr/request/macro/TestMacros.java +++ b/solr/core/src/test/org/apache/solr/request/macro/TestMacros.java @@ -1,5 +1,3 @@ -package org.apache.solr.request.macro; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,7 +14,7 @@ package org.apache.solr.request.macro; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.request.macro; import org.apache.solr.SolrTestCaseJ4; import org.junit.BeforeClass; diff --git a/solr/core/src/test/org/apache/solr/response/TestCSVResponseWriter.java b/solr/core/src/test/org/apache/solr/response/TestCSVResponseWriter.java index 887d100ab3d..c9b59d64fb6 100644 --- a/solr/core/src/test/org/apache/solr/response/TestCSVResponseWriter.java +++ b/solr/core/src/test/org/apache/solr/response/TestCSVResponseWriter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.response; import org.apache.solr.SolrTestCaseJ4; diff --git a/solr/core/src/test/org/apache/solr/response/TestChildDocTransformer.java b/solr/core/src/test/org/apache/solr/response/TestChildDocTransformer.java index eb20ee1aa37..124fb7c655b 100644 --- a/solr/core/src/test/org/apache/solr/response/TestChildDocTransformer.java +++ b/solr/core/src/test/org/apache/solr/response/TestChildDocTransformer.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 @@ -16,6 +14,7 @@ package org.apache.solr.response; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.response; import org.apache.lucene.util.TestUtil; import org.apache.solr.SolrTestCaseJ4; diff --git a/solr/core/src/test/org/apache/solr/response/TestCustomDocTransformer.java b/solr/core/src/test/org/apache/solr/response/TestCustomDocTransformer.java index ecf4859c0fd..212ab105559 100644 --- a/solr/core/src/test/org/apache/solr/response/TestCustomDocTransformer.java +++ b/solr/core/src/test/org/apache/solr/response/TestCustomDocTransformer.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 @@ -16,6 +14,7 @@ package org.apache.solr.response; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.response; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/response/TestPHPSerializedResponseWriter.java b/solr/core/src/test/org/apache/solr/response/TestPHPSerializedResponseWriter.java index 0110f535516..fda7629b5cc 100644 --- a/solr/core/src/test/org/apache/solr/response/TestPHPSerializedResponseWriter.java +++ b/solr/core/src/test/org/apache/solr/response/TestPHPSerializedResponseWriter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.response; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/response/TestRawResponseWriter.java b/solr/core/src/test/org/apache/solr/response/TestRawResponseWriter.java index 41039498e86..89a96bf14a5 100644 --- a/solr/core/src/test/org/apache/solr/response/TestRawResponseWriter.java +++ b/solr/core/src/test/org/apache/solr/response/TestRawResponseWriter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.response; import java.io.ByteArrayInputStream; diff --git a/solr/core/src/test/org/apache/solr/response/TestRawTransformer.java b/solr/core/src/test/org/apache/solr/response/TestRawTransformer.java index d8b66fd5104..ea5619f96a4 100644 --- a/solr/core/src/test/org/apache/solr/response/TestRawTransformer.java +++ b/solr/core/src/test/org/apache/solr/response/TestRawTransformer.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 @@ -16,6 +14,7 @@ package org.apache.solr.response; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.response; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.common.SolrInputDocument; diff --git a/solr/core/src/test/org/apache/solr/response/TestSolrQueryResponse.java b/solr/core/src/test/org/apache/solr/response/TestSolrQueryResponse.java index ba32a533e5b..e938afc7493 100644 --- a/solr/core/src/test/org/apache/solr/response/TestSolrQueryResponse.java +++ b/solr/core/src/test/org/apache/solr/response/TestSolrQueryResponse.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 @@ -16,6 +14,7 @@ package org.apache.solr.response; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.response; import java.io.IOException; import java.lang.ArithmeticException; diff --git a/solr/core/src/test/org/apache/solr/response/TestSortingResponseWriter.java b/solr/core/src/test/org/apache/solr/response/TestSortingResponseWriter.java index bb432ecccc1..2691d98d5ad 100644 --- a/solr/core/src/test/org/apache/solr/response/TestSortingResponseWriter.java +++ b/solr/core/src/test/org/apache/solr/response/TestSortingResponseWriter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.response; import org.apache.solr.SolrTestCaseJ4; diff --git a/solr/core/src/test/org/apache/solr/rest/SolrRestletTestBase.java b/solr/core/src/test/org/apache/solr/rest/SolrRestletTestBase.java index ea8a40c1b09..5ce6a9e092c 100644 --- a/solr/core/src/test/org/apache/solr/rest/SolrRestletTestBase.java +++ b/solr/core/src/test/org/apache/solr/rest/SolrRestletTestBase.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.rest; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.rest; import org.apache.solr.util.RestTestBase; import org.eclipse.jetty.servlet.ServletHolder; import org.junit.BeforeClass; diff --git a/solr/core/src/test/org/apache/solr/rest/TestManagedResource.java b/solr/core/src/test/org/apache/solr/rest/TestManagedResource.java index 8f1860247d6..cce210984f9 100644 --- a/solr/core/src/test/org/apache/solr/rest/TestManagedResource.java +++ b/solr/core/src/test/org/apache/solr/rest/TestManagedResource.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.rest; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.rest; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; diff --git a/solr/core/src/test/org/apache/solr/rest/TestManagedResourceStorage.java b/solr/core/src/test/org/apache/solr/rest/TestManagedResourceStorage.java index de469512641..bbf84534295 100644 --- a/solr/core/src/test/org/apache/solr/rest/TestManagedResourceStorage.java +++ b/solr/core/src/test/org/apache/solr/rest/TestManagedResourceStorage.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.rest; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.rest; import java.io.File; import java.nio.file.Paths; import java.util.ArrayList; diff --git a/solr/core/src/test/org/apache/solr/rest/TestRestManager.java b/solr/core/src/test/org/apache/solr/rest/TestRestManager.java index c45c14f40e2..ab2c45b4eed 100644 --- a/solr/core/src/test/org/apache/solr/rest/TestRestManager.java +++ b/solr/core/src/test/org/apache/solr/rest/TestRestManager.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.rest; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.rest; import java.io.File; import java.nio.file.Paths; import java.util.Arrays; diff --git a/solr/core/src/test/org/apache/solr/rest/schema/TestBulkSchemaAPI.java b/solr/core/src/test/org/apache/solr/rest/schema/TestBulkSchemaAPI.java index bd050153ded..4fbd97214d9 100644 --- a/solr/core/src/test/org/apache/solr/rest/schema/TestBulkSchemaAPI.java +++ b/solr/core/src/test/org/apache/solr/rest/schema/TestBulkSchemaAPI.java @@ -1,5 +1,3 @@ -package org.apache.solr.rest.schema; - /* * 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.rest.schema; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.rest.schema; import org.apache.commons.io.FileUtils; diff --git a/solr/core/src/test/org/apache/solr/rest/schema/TestClassNameShortening.java b/solr/core/src/test/org/apache/solr/rest/schema/TestClassNameShortening.java index f4ad4bbce6c..ddbd331ee87 100644 --- a/solr/core/src/test/org/apache/solr/rest/schema/TestClassNameShortening.java +++ b/solr/core/src/test/org/apache/solr/rest/schema/TestClassNameShortening.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.rest.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.rest.schema; import org.apache.solr.util.RestTestBase; import org.eclipse.jetty.servlet.ServletHolder; import org.junit.BeforeClass; diff --git a/solr/core/src/test/org/apache/solr/rest/schema/TestCopyFieldCollectionResource.java b/solr/core/src/test/org/apache/solr/rest/schema/TestCopyFieldCollectionResource.java index 383e2b3b1ff..5eeee8c7a33 100644 --- a/solr/core/src/test/org/apache/solr/rest/schema/TestCopyFieldCollectionResource.java +++ b/solr/core/src/test/org/apache/solr/rest/schema/TestCopyFieldCollectionResource.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.rest.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.rest.schema; import org.apache.solr.rest.SolrRestletTestBase; import org.junit.Test; diff --git a/solr/core/src/test/org/apache/solr/rest/schema/TestDefaultSearchFieldResource.java b/solr/core/src/test/org/apache/solr/rest/schema/TestDefaultSearchFieldResource.java index 9931ffc8819..84ccd0af877 100644 --- a/solr/core/src/test/org/apache/solr/rest/schema/TestDefaultSearchFieldResource.java +++ b/solr/core/src/test/org/apache/solr/rest/schema/TestDefaultSearchFieldResource.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.rest.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.rest.schema; import org.apache.solr.rest.SolrRestletTestBase; import org.junit.Test; diff --git a/solr/core/src/test/org/apache/solr/rest/schema/TestDynamicFieldCollectionResource.java b/solr/core/src/test/org/apache/solr/rest/schema/TestDynamicFieldCollectionResource.java index 0ff5fa4975e..318b28a78ad 100644 --- a/solr/core/src/test/org/apache/solr/rest/schema/TestDynamicFieldCollectionResource.java +++ b/solr/core/src/test/org/apache/solr/rest/schema/TestDynamicFieldCollectionResource.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.rest.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.rest.schema; import org.apache.solr.rest.SolrRestletTestBase; import org.junit.Test; diff --git a/solr/core/src/test/org/apache/solr/rest/schema/TestDynamicFieldResource.java b/solr/core/src/test/org/apache/solr/rest/schema/TestDynamicFieldResource.java index 01f5683afcf..54b17fcdd9f 100644 --- a/solr/core/src/test/org/apache/solr/rest/schema/TestDynamicFieldResource.java +++ b/solr/core/src/test/org/apache/solr/rest/schema/TestDynamicFieldResource.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.rest.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.rest.schema; import org.apache.solr.rest.SolrRestletTestBase; import org.junit.Test; diff --git a/solr/core/src/test/org/apache/solr/rest/schema/TestFieldCollectionResource.java b/solr/core/src/test/org/apache/solr/rest/schema/TestFieldCollectionResource.java index f075b370390..571acc52bff 100644 --- a/solr/core/src/test/org/apache/solr/rest/schema/TestFieldCollectionResource.java +++ b/solr/core/src/test/org/apache/solr/rest/schema/TestFieldCollectionResource.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.rest.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.rest.schema; import com.carrotsearch.randomizedtesting.annotations.Seed; import org.apache.solr.rest.SolrRestletTestBase; import org.junit.Test; diff --git a/solr/core/src/test/org/apache/solr/rest/schema/TestFieldResource.java b/solr/core/src/test/org/apache/solr/rest/schema/TestFieldResource.java index 570e81082de..711e3c05fac 100644 --- a/solr/core/src/test/org/apache/solr/rest/schema/TestFieldResource.java +++ b/solr/core/src/test/org/apache/solr/rest/schema/TestFieldResource.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.rest.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.rest.schema; import org.apache.solr.rest.SolrRestletTestBase; import org.junit.Test; diff --git a/solr/core/src/test/org/apache/solr/rest/schema/TestFieldTypeCollectionResource.java b/solr/core/src/test/org/apache/solr/rest/schema/TestFieldTypeCollectionResource.java index 9969c75b176..a61f6444dcc 100644 --- a/solr/core/src/test/org/apache/solr/rest/schema/TestFieldTypeCollectionResource.java +++ b/solr/core/src/test/org/apache/solr/rest/schema/TestFieldTypeCollectionResource.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.rest.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.rest.schema; import org.apache.solr.rest.SolrRestletTestBase; import org.junit.Test; diff --git a/solr/core/src/test/org/apache/solr/rest/schema/TestFieldTypeResource.java b/solr/core/src/test/org/apache/solr/rest/schema/TestFieldTypeResource.java index c5e366e99db..2f0c2410365 100644 --- a/solr/core/src/test/org/apache/solr/rest/schema/TestFieldTypeResource.java +++ b/solr/core/src/test/org/apache/solr/rest/schema/TestFieldTypeResource.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -13,8 +12,9 @@ package org.apache.solr.rest.schema; * 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 - * limit ations under the License. + * limitations under the License. */ +package org.apache.solr.rest.schema; import org.apache.solr.rest.SolrRestletTestBase; import org.junit.Test; diff --git a/solr/core/src/test/org/apache/solr/rest/schema/TestManagedSchemaDynamicFieldResource.java b/solr/core/src/test/org/apache/solr/rest/schema/TestManagedSchemaDynamicFieldResource.java index 792d1634395..65727099eab 100644 --- a/solr/core/src/test/org/apache/solr/rest/schema/TestManagedSchemaDynamicFieldResource.java +++ b/solr/core/src/test/org/apache/solr/rest/schema/TestManagedSchemaDynamicFieldResource.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.rest.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.rest.schema; import org.apache.commons.io.FileUtils; import org.apache.solr.util.RestTestBase; import org.eclipse.jetty.servlet.ServletHolder; diff --git a/solr/core/src/test/org/apache/solr/rest/schema/TestManagedSchemaFieldResource.java b/solr/core/src/test/org/apache/solr/rest/schema/TestManagedSchemaFieldResource.java index 83eb1a8b120..b39d266f223 100644 --- a/solr/core/src/test/org/apache/solr/rest/schema/TestManagedSchemaFieldResource.java +++ b/solr/core/src/test/org/apache/solr/rest/schema/TestManagedSchemaFieldResource.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.rest.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.rest.schema; import org.apache.commons.io.FileUtils; import org.apache.solr.util.RestTestBase; import org.eclipse.jetty.servlet.ServletHolder; diff --git a/solr/core/src/test/org/apache/solr/rest/schema/TestManagedSchemaFieldTypeResource.java b/solr/core/src/test/org/apache/solr/rest/schema/TestManagedSchemaFieldTypeResource.java index a3aec9cfdef..a0f4e2538a7 100644 --- a/solr/core/src/test/org/apache/solr/rest/schema/TestManagedSchemaFieldTypeResource.java +++ b/solr/core/src/test/org/apache/solr/rest/schema/TestManagedSchemaFieldTypeResource.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.rest.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.rest.schema; import java.io.File; import java.util.ArrayList; import java.util.Arrays; diff --git a/solr/core/src/test/org/apache/solr/rest/schema/TestRemoveLastDynamicCopyField.java b/solr/core/src/test/org/apache/solr/rest/schema/TestRemoveLastDynamicCopyField.java index 47a06ae89f7..4b4ddd34bac 100644 --- a/solr/core/src/test/org/apache/solr/rest/schema/TestRemoveLastDynamicCopyField.java +++ b/solr/core/src/test/org/apache/solr/rest/schema/TestRemoveLastDynamicCopyField.java @@ -1,5 +1,3 @@ -package org.apache.solr.rest.schema; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,7 +14,7 @@ package org.apache.solr.rest.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.rest.schema; import java.io.File; import java.io.StringReader; diff --git a/solr/core/src/test/org/apache/solr/rest/schema/TestSchemaNameResource.java b/solr/core/src/test/org/apache/solr/rest/schema/TestSchemaNameResource.java index 73bf0bcb2c9..671181a31b5 100644 --- a/solr/core/src/test/org/apache/solr/rest/schema/TestSchemaNameResource.java +++ b/solr/core/src/test/org/apache/solr/rest/schema/TestSchemaNameResource.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.rest.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.rest.schema; import org.apache.solr.rest.SolrRestletTestBase; import org.junit.Test; diff --git a/solr/core/src/test/org/apache/solr/rest/schema/TestSchemaResource.java b/solr/core/src/test/org/apache/solr/rest/schema/TestSchemaResource.java index dc0bc47ff36..24638e46df7 100644 --- a/solr/core/src/test/org/apache/solr/rest/schema/TestSchemaResource.java +++ b/solr/core/src/test/org/apache/solr/rest/schema/TestSchemaResource.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,8 +14,7 @@ package org.apache.solr.rest.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - - +package org.apache.solr.rest.schema; import org.apache.solr.rest.SolrRestletTestBase; import org.junit.Test; diff --git a/solr/core/src/test/org/apache/solr/rest/schema/TestSchemaSimilarityResource.java b/solr/core/src/test/org/apache/solr/rest/schema/TestSchemaSimilarityResource.java index 8eed4358044..6b7be719e66 100644 --- a/solr/core/src/test/org/apache/solr/rest/schema/TestSchemaSimilarityResource.java +++ b/solr/core/src/test/org/apache/solr/rest/schema/TestSchemaSimilarityResource.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.rest.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.rest.schema; import org.apache.solr.rest.SolrRestletTestBase; import org.junit.Test; diff --git a/solr/core/src/test/org/apache/solr/rest/schema/TestSchemaVersionResource.java b/solr/core/src/test/org/apache/solr/rest/schema/TestSchemaVersionResource.java index 645843e9dac..fdd38223a22 100644 --- a/solr/core/src/test/org/apache/solr/rest/schema/TestSchemaVersionResource.java +++ b/solr/core/src/test/org/apache/solr/rest/schema/TestSchemaVersionResource.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.rest.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.rest.schema; import org.apache.solr.rest.SolrRestletTestBase; import org.junit.Test; diff --git a/solr/core/src/test/org/apache/solr/rest/schema/TestSerializedLuceneMatchVersion.java b/solr/core/src/test/org/apache/solr/rest/schema/TestSerializedLuceneMatchVersion.java index ca3d8ed8c25..f50d669dc8c 100644 --- a/solr/core/src/test/org/apache/solr/rest/schema/TestSerializedLuceneMatchVersion.java +++ b/solr/core/src/test/org/apache/solr/rest/schema/TestSerializedLuceneMatchVersion.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.rest.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.rest.schema; import org.apache.solr.util.RestTestBase; import org.eclipse.jetty.servlet.ServletHolder; import org.junit.BeforeClass; diff --git a/solr/core/src/test/org/apache/solr/rest/schema/TestSolrQueryParserDefaultOperatorResource.java b/solr/core/src/test/org/apache/solr/rest/schema/TestSolrQueryParserDefaultOperatorResource.java index 0dce918f2d6..064c3ace9e2 100644 --- a/solr/core/src/test/org/apache/solr/rest/schema/TestSolrQueryParserDefaultOperatorResource.java +++ b/solr/core/src/test/org/apache/solr/rest/schema/TestSolrQueryParserDefaultOperatorResource.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.rest.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.rest.schema; import org.apache.solr.rest.SolrRestletTestBase; import org.junit.Test; diff --git a/solr/core/src/test/org/apache/solr/rest/schema/TestSolrQueryParserResource.java b/solr/core/src/test/org/apache/solr/rest/schema/TestSolrQueryParserResource.java index 7c00e53d6a0..d4946ade76f 100644 --- a/solr/core/src/test/org/apache/solr/rest/schema/TestSolrQueryParserResource.java +++ b/solr/core/src/test/org/apache/solr/rest/schema/TestSolrQueryParserResource.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.rest.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.rest.schema; import org.apache.solr.rest.SolrRestletTestBase; import org.junit.Test; diff --git a/solr/core/src/test/org/apache/solr/rest/schema/TestUniqueKeyFieldResource.java b/solr/core/src/test/org/apache/solr/rest/schema/TestUniqueKeyFieldResource.java index 2129fc30a2d..e58d5aa3faf 100644 --- a/solr/core/src/test/org/apache/solr/rest/schema/TestUniqueKeyFieldResource.java +++ b/solr/core/src/test/org/apache/solr/rest/schema/TestUniqueKeyFieldResource.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.rest.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.rest.schema; import org.apache.solr.rest.SolrRestletTestBase; import org.junit.Test; diff --git a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedStopFilterFactory.java b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedStopFilterFactory.java index ad9ab29515e..242e5b5f419 100644 --- a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedStopFilterFactory.java +++ b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedStopFilterFactory.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest.schema.analysis; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.rest.schema.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.rest.schema.analysis; import java.io.File; import java.util.Arrays; import java.util.SortedMap; diff --git a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymFilterFactory.java b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymFilterFactory.java index 271dfe73b9b..54a6529d2a3 100644 --- a/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymFilterFactory.java +++ b/solr/core/src/test/org/apache/solr/rest/schema/analysis/TestManagedSynonymFilterFactory.java @@ -1,4 +1,3 @@ -package org.apache.solr.rest.schema.analysis; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.rest.schema.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.rest.schema.analysis; import java.io.File; import java.util.ArrayList; import java.util.Arrays; diff --git a/solr/core/src/test/org/apache/solr/schema/AbstractCurrencyFieldTest.java b/solr/core/src/test/org/apache/solr/schema/AbstractCurrencyFieldTest.java index 68847a0fd9a..c0907af7ce5 100644 --- a/solr/core/src/test/org/apache/solr/schema/AbstractCurrencyFieldTest.java +++ b/solr/core/src/test/org/apache/solr/schema/AbstractCurrencyFieldTest.java @@ -1,4 +1,3 @@ -package org.apache.solr.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.schema; import java.util.Currency; import java.util.List; import java.util.Random; diff --git a/solr/core/src/test/org/apache/solr/schema/BadCopyFieldTest.java b/solr/core/src/test/org/apache/solr/schema/BadCopyFieldTest.java index aca3f5ecd46..0cbcd478054 100644 --- a/solr/core/src/test/org/apache/solr/schema/BadCopyFieldTest.java +++ b/solr/core/src/test/org/apache/solr/schema/BadCopyFieldTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; import org.apache.solr.core.AbstractBadConfigTestBase; diff --git a/solr/core/src/test/org/apache/solr/schema/BadIndexSchemaTest.java b/solr/core/src/test/org/apache/solr/schema/BadIndexSchemaTest.java index 874ad2ddc34..8d2f93aa40e 100644 --- a/solr/core/src/test/org/apache/solr/schema/BadIndexSchemaTest.java +++ b/solr/core/src/test/org/apache/solr/schema/BadIndexSchemaTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; import org.apache.solr.core.AbstractBadConfigTestBase; diff --git a/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java b/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java index 18dbea13f04..683dbe835ee 100644 --- a/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java +++ b/solr/core/src/test/org/apache/solr/schema/ChangedSchemaMergeTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; import java.io.File; diff --git a/solr/core/src/test/org/apache/solr/schema/CopyFieldTest.java b/solr/core/src/test/org/apache/solr/schema/CopyFieldTest.java index 780cd647134..93cbb0a4ae1 100644 --- a/solr/core/src/test/org/apache/solr/schema/CopyFieldTest.java +++ b/solr/core/src/test/org/apache/solr/schema/CopyFieldTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; import java.util.HashMap; diff --git a/solr/core/src/test/org/apache/solr/schema/CurrencyFieldOpenExchangeTest.java b/solr/core/src/test/org/apache/solr/schema/CurrencyFieldOpenExchangeTest.java index 47173b3c1b4..eb79e0925ff 100644 --- a/solr/core/src/test/org/apache/solr/schema/CurrencyFieldOpenExchangeTest.java +++ b/solr/core/src/test/org/apache/solr/schema/CurrencyFieldOpenExchangeTest.java @@ -1,4 +1,3 @@ -package org.apache.solr.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.schema; import org.apache.lucene.index.IndexableField; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.core.SolrCore; diff --git a/solr/core/src/test/org/apache/solr/schema/CurrencyFieldXmlFileTest.java b/solr/core/src/test/org/apache/solr/schema/CurrencyFieldXmlFileTest.java index 547d06a1fd1..7c27faa1d13 100644 --- a/solr/core/src/test/org/apache/solr/schema/CurrencyFieldXmlFileTest.java +++ b/solr/core/src/test/org/apache/solr/schema/CurrencyFieldXmlFileTest.java @@ -1,4 +1,3 @@ -package org.apache.solr.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.schema; import org.apache.lucene.index.IndexableField; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.core.SolrCore; diff --git a/solr/core/src/test/org/apache/solr/schema/CustomAnalyzerStrField.java b/solr/core/src/test/org/apache/solr/schema/CustomAnalyzerStrField.java index c24114a05c7..e837e5d2af6 100644 --- a/solr/core/src/test/org/apache/solr/schema/CustomAnalyzerStrField.java +++ b/solr/core/src/test/org/apache/solr/schema/CustomAnalyzerStrField.java @@ -1,5 +1,3 @@ -package org.apache.solr.schema; - /* * 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.schema; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.schema; import java.util.HashMap; import java.util.Random; diff --git a/solr/core/src/test/org/apache/solr/schema/DateFieldTest.java b/solr/core/src/test/org/apache/solr/schema/DateFieldTest.java index 83bcabc2da5..8b6ad1d8a3c 100644 --- a/solr/core/src/test/org/apache/solr/schema/DateFieldTest.java +++ b/solr/core/src/test/org/apache/solr/schema/DateFieldTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; import java.io.File; diff --git a/solr/core/src/test/org/apache/solr/schema/DateRangeFieldTest.java b/solr/core/src/test/org/apache/solr/schema/DateRangeFieldTest.java index afe22355195..372c9e97eec 100644 --- a/solr/core/src/test/org/apache/solr/schema/DateRangeFieldTest.java +++ b/solr/core/src/test/org/apache/solr/schema/DateRangeFieldTest.java @@ -1,9 +1,7 @@ -package org.apache.solr.schema; - /* * 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.NRP + * 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 @@ -16,6 +14,7 @@ package org.apache.solr.schema; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.schema; import org.apache.solr.SolrTestCaseJ4; import org.junit.BeforeClass; diff --git a/solr/core/src/test/org/apache/solr/schema/DocValuesMissingTest.java b/solr/core/src/test/org/apache/solr/schema/DocValuesMissingTest.java index eba83b0eaee..847130b4cb4 100644 --- a/solr/core/src/test/org/apache/solr/schema/DocValuesMissingTest.java +++ b/solr/core/src/test/org/apache/solr/schema/DocValuesMissingTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.schema; - /* * 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.schema; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.schema; import org.apache.solr.SolrTestCaseJ4; import org.junit.BeforeClass; diff --git a/solr/core/src/test/org/apache/solr/schema/DocValuesMultiTest.java b/solr/core/src/test/org/apache/solr/schema/DocValuesMultiTest.java index 26474d96908..b544d5311dd 100644 --- a/solr/core/src/test/org/apache/solr/schema/DocValuesMultiTest.java +++ b/solr/core/src/test/org/apache/solr/schema/DocValuesMultiTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.schema; - /* * 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.schema; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.schema; import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.DocValuesType; diff --git a/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java b/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java index 298bdc2f74a..a9aa401cbf1 100644 --- a/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java +++ b/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.schema; - /* * 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.schema; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.schema; import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.DocValuesType; diff --git a/solr/core/src/test/org/apache/solr/schema/EnumFieldTest.java b/solr/core/src/test/org/apache/solr/schema/EnumFieldTest.java index 100d9a22fd7..8abbce7f509 100644 --- a/solr/core/src/test/org/apache/solr/schema/EnumFieldTest.java +++ b/solr/core/src/test/org/apache/solr/schema/EnumFieldTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.schema; - /* * 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.schema; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.schema; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.request.SolrQueryRequest; diff --git a/solr/core/src/test/org/apache/solr/schema/ExternalFileFieldSortTest.java b/solr/core/src/test/org/apache/solr/schema/ExternalFileFieldSortTest.java index b8b373bb26b..1438cac1873 100644 --- a/solr/core/src/test/org/apache/solr/schema/ExternalFileFieldSortTest.java +++ b/solr/core/src/test/org/apache/solr/schema/ExternalFileFieldSortTest.java @@ -1,13 +1,3 @@ -package org.apache.solr.schema; - -import org.apache.commons.io.FileUtils; -import org.apache.solr.SolrTestCaseJ4; -import org.junit.BeforeClass; -import org.junit.Test; - -import java.io.File; -import java.io.IOException; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -24,6 +14,15 @@ import java.io.IOException; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.schema; + +import org.apache.commons.io.FileUtils; +import org.apache.solr.SolrTestCaseJ4; +import org.junit.BeforeClass; +import org.junit.Test; + +import java.io.File; +import java.io.IOException; public class ExternalFileFieldSortTest extends SolrTestCaseJ4 { diff --git a/solr/core/src/test/org/apache/solr/schema/IndexSchemaRuntimeFieldTest.java b/solr/core/src/test/org/apache/solr/schema/IndexSchemaRuntimeFieldTest.java index 84b2a91bc4c..1a429b291a9 100644 --- a/solr/core/src/test/org/apache/solr/schema/IndexSchemaRuntimeFieldTest.java +++ b/solr/core/src/test/org/apache/solr/schema/IndexSchemaRuntimeFieldTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.schema; - /* * 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.schema; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.schema; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.client.solrj.SolrQuery; diff --git a/solr/core/src/test/org/apache/solr/schema/IndexSchemaTest.java b/solr/core/src/test/org/apache/solr/schema/IndexSchemaTest.java index e6a7d9a70a3..44716bb3ad3 100644 --- a/solr/core/src/test/org/apache/solr/schema/IndexSchemaTest.java +++ b/solr/core/src/test/org/apache/solr/schema/IndexSchemaTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; import org.apache.solr.SolrTestCaseJ4; diff --git a/solr/core/src/test/org/apache/solr/schema/MockExchangeRateProvider.java b/solr/core/src/test/org/apache/solr/schema/MockExchangeRateProvider.java index e342e015828..ec72837550a 100644 --- a/solr/core/src/test/org/apache/solr/schema/MockExchangeRateProvider.java +++ b/solr/core/src/test/org/apache/solr/schema/MockExchangeRateProvider.java @@ -1,4 +1,3 @@ -package org.apache.solr.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.schema; import java.util.HashMap; import java.util.HashSet; import java.util.Map; diff --git a/solr/core/src/test/org/apache/solr/schema/MultiTermTest.java b/solr/core/src/test/org/apache/solr/schema/MultiTermTest.java index ba8515a3da3..dd56ceddcca 100644 --- a/solr/core/src/test/org/apache/solr/schema/MultiTermTest.java +++ b/solr/core/src/test/org/apache/solr/schema/MultiTermTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.schema; - /* * 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.schema; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.schema; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.charfilter.MappingCharFilterFactory; diff --git a/solr/core/src/test/org/apache/solr/schema/MyCrazyCustomField.java b/solr/core/src/test/org/apache/solr/schema/MyCrazyCustomField.java index 1b60fdc0770..d7b39a17cd2 100644 --- a/solr/core/src/test/org/apache/solr/schema/MyCrazyCustomField.java +++ b/solr/core/src/test/org/apache/solr/schema/MyCrazyCustomField.java @@ -1,5 +1,3 @@ -package org.apache.solr.schema; - /* * 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.schema; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.schema; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/schema/NotRequiredUniqueKeyTest.java b/solr/core/src/test/org/apache/solr/schema/NotRequiredUniqueKeyTest.java index f895f0dc4e2..a21cb169064 100644 --- a/solr/core/src/test/org/apache/solr/schema/NotRequiredUniqueKeyTest.java +++ b/solr/core/src/test/org/apache/solr/schema/NotRequiredUniqueKeyTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; import org.apache.solr.SolrTestCaseJ4; diff --git a/solr/core/src/test/org/apache/solr/schema/NumericFieldsTest.java b/solr/core/src/test/org/apache/solr/schema/NumericFieldsTest.java index 13064fdbb3a..fe5975ed058 100644 --- a/solr/core/src/test/org/apache/solr/schema/NumericFieldsTest.java +++ b/solr/core/src/test/org/apache/solr/schema/NumericFieldsTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; import org.apache.solr.SolrTestCaseJ4; diff --git a/solr/core/src/test/org/apache/solr/schema/OpenExchangeRatesOrgProviderTest.java b/solr/core/src/test/org/apache/solr/schema/OpenExchangeRatesOrgProviderTest.java index 8bb00f7d819..ce44c38d823 100644 --- a/solr/core/src/test/org/apache/solr/schema/OpenExchangeRatesOrgProviderTest.java +++ b/solr/core/src/test/org/apache/solr/schema/OpenExchangeRatesOrgProviderTest.java @@ -1,4 +1,3 @@ -package org.apache.solr.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.schema; import java.util.HashMap; import java.util.Map; diff --git a/solr/core/src/test/org/apache/solr/schema/PolyFieldTest.java b/solr/core/src/test/org/apache/solr/schema/PolyFieldTest.java index a83beb7a775..ba593443b43 100644 --- a/solr/core/src/test/org/apache/solr/schema/PolyFieldTest.java +++ b/solr/core/src/test/org/apache/solr/schema/PolyFieldTest.java @@ -1,4 +1,3 @@ -package org.apache.solr.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.schema; import java.util.List; import org.apache.lucene.index.IndexableField; diff --git a/solr/core/src/test/org/apache/solr/schema/PreAnalyzedFieldTest.java b/solr/core/src/test/org/apache/solr/schema/PreAnalyzedFieldTest.java index 7d3b65fbcf2..622a6344219 100644 --- a/solr/core/src/test/org/apache/solr/schema/PreAnalyzedFieldTest.java +++ b/solr/core/src/test/org/apache/solr/schema/PreAnalyzedFieldTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.schema; - /* * 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.schema; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.schema; import java.util.Collections; import java.util.HashMap; diff --git a/solr/core/src/test/org/apache/solr/schema/PrimitiveFieldTypeTest.java b/solr/core/src/test/org/apache/solr/schema/PrimitiveFieldTypeTest.java index fc4db6f0472..897af9274ab 100644 --- a/solr/core/src/test/org/apache/solr/schema/PrimitiveFieldTypeTest.java +++ b/solr/core/src/test/org/apache/solr/schema/PrimitiveFieldTypeTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; import java.io.File; diff --git a/solr/core/src/test/org/apache/solr/schema/RequiredFieldsTest.java b/solr/core/src/test/org/apache/solr/schema/RequiredFieldsTest.java index db727d160d3..6827002c3a0 100644 --- a/solr/core/src/test/org/apache/solr/schema/RequiredFieldsTest.java +++ b/solr/core/src/test/org/apache/solr/schema/RequiredFieldsTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; import java.util.Collection; diff --git a/solr/core/src/test/org/apache/solr/schema/SchemaVersionSpecificBehaviorTest.java b/solr/core/src/test/org/apache/solr/schema/SchemaVersionSpecificBehaviorTest.java index 2cdc7317b0f..cf34e959aad 100644 --- a/solr/core/src/test/org/apache/solr/schema/SchemaVersionSpecificBehaviorTest.java +++ b/solr/core/src/test/org/apache/solr/schema/SchemaVersionSpecificBehaviorTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; import org.apache.solr.SolrTestCaseJ4; diff --git a/solr/core/src/test/org/apache/solr/schema/SortableBinaryField.java b/solr/core/src/test/org/apache/solr/schema/SortableBinaryField.java index 2c4913b3634..5bd565b1819 100644 --- a/solr/core/src/test/org/apache/solr/schema/SortableBinaryField.java +++ b/solr/core/src/test/org/apache/solr/schema/SortableBinaryField.java @@ -1,5 +1,3 @@ -package org.apache.solr.schema; - /* * 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.schema; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.schema; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/solr/core/src/test/org/apache/solr/schema/SpatialRPTFieldTypeTest.java b/solr/core/src/test/org/apache/solr/schema/SpatialRPTFieldTypeTest.java index 07a6f8f7bd4..4cb40efbb73 100644 --- a/solr/core/src/test/org/apache/solr/schema/SpatialRPTFieldTypeTest.java +++ b/solr/core/src/test/org/apache/solr/schema/SpatialRPTFieldTypeTest.java @@ -1,4 +1,3 @@ -package org.apache.solr.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.schema; import java.io.File; import java.nio.file.Files; import java.util.HashMap; diff --git a/solr/core/src/test/org/apache/solr/schema/SynonymTokenizerTest.java b/solr/core/src/test/org/apache/solr/schema/SynonymTokenizerTest.java index e5f7721c8c2..5813b8e7c51 100644 --- a/solr/core/src/test/org/apache/solr/schema/SynonymTokenizerTest.java +++ b/solr/core/src/test/org/apache/solr/schema/SynonymTokenizerTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.schema; - /* * 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.schema; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.schema; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.core.SolrCore; diff --git a/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java b/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java index 75e12089810..595a9a7946a 100644 --- a/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java +++ b/solr/core/src/test/org/apache/solr/schema/TestBinaryField.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; import com.google.common.base.Charsets; diff --git a/solr/core/src/test/org/apache/solr/schema/TestBulkSchemaConcurrent.java b/solr/core/src/test/org/apache/solr/schema/TestBulkSchemaConcurrent.java index 29bf82ddb97..013bd900a16 100644 --- a/solr/core/src/test/org/apache/solr/schema/TestBulkSchemaConcurrent.java +++ b/solr/core/src/test/org/apache/solr/schema/TestBulkSchemaConcurrent.java @@ -1,5 +1,3 @@ -package org.apache.solr.schema; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,7 +14,7 @@ package org.apache.solr.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.schema; import static org.apache.solr.rest.schema.TestBulkSchemaAPI.getSourceCopyFields; import static org.apache.solr.rest.schema.TestBulkSchemaAPI.getObj; diff --git a/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchema.java b/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchema.java index 2254d1f0acf..3c7a90eeacd 100644 --- a/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchema.java +++ b/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchema.java @@ -1,4 +1,3 @@ -package org.apache.solr.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.schema; import org.apache.solr.client.solrj.SolrServerException; import org.apache.solr.client.solrj.impl.HttpSolrClient; import org.apache.solr.client.solrj.request.QueryRequest; diff --git a/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchemaConcurrent.java b/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchemaConcurrent.java index f73e252c855..3d0d120c0ad 100644 --- a/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchemaConcurrent.java +++ b/solr/core/src/test/org/apache/solr/schema/TestCloudManagedSchemaConcurrent.java @@ -1,4 +1,3 @@ -package org.apache.solr.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.schema; import java.lang.invoke.MethodHandles; import java.util.ArrayList; import java.util.List; diff --git a/solr/core/src/test/org/apache/solr/schema/TestCloudSchemaless.java b/solr/core/src/test/org/apache/solr/schema/TestCloudSchemaless.java index a77e4f67119..dd5794d5615 100644 --- a/solr/core/src/test/org/apache/solr/schema/TestCloudSchemaless.java +++ b/solr/core/src/test/org/apache/solr/schema/TestCloudSchemaless.java @@ -1,4 +1,3 @@ -package org.apache.solr.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.schema; import org.apache.solr.SolrTestCaseJ4.SuppressSSL; import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.impl.CloudSolrClient; diff --git a/solr/core/src/test/org/apache/solr/schema/TestCollationField.java b/solr/core/src/test/org/apache/solr/schema/TestCollationField.java index f13e2db8b9a..8eb2bd9457f 100644 --- a/solr/core/src/test/org/apache/solr/schema/TestCollationField.java +++ b/solr/core/src/test/org/apache/solr/schema/TestCollationField.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; import java.io.File; diff --git a/solr/core/src/test/org/apache/solr/schema/TestCollationFieldDocValues.java b/solr/core/src/test/org/apache/solr/schema/TestCollationFieldDocValues.java index 1440299e5ae..1de339a7c99 100644 --- a/solr/core/src/test/org/apache/solr/schema/TestCollationFieldDocValues.java +++ b/solr/core/src/test/org/apache/solr/schema/TestCollationFieldDocValues.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.schema; import java.io.File; diff --git a/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java b/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java index 509f32a941f..ae8dd4ecb53 100644 --- a/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java +++ b/solr/core/src/test/org/apache/solr/schema/TestManagedSchema.java @@ -1,4 +1,3 @@ -package org.apache.solr.schema; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.schema; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.schema; import java.io.File; import java.io.FileInputStream; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/test/org/apache/solr/schema/TestOmitPositions.java b/solr/core/src/test/org/apache/solr/schema/TestOmitPositions.java index c16d9e4d18d..19081b96df6 100644 --- a/solr/core/src/test/org/apache/solr/schema/TestOmitPositions.java +++ b/solr/core/src/test/org/apache/solr/schema/TestOmitPositions.java @@ -1,5 +1,3 @@ -package org.apache.solr.schema; - /* * 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.schema; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.schema; import org.apache.solr.SolrTestCaseJ4; import org.junit.BeforeClass; diff --git a/solr/core/src/test/org/apache/solr/schema/TestSchemaManager.java b/solr/core/src/test/org/apache/solr/schema/TestSchemaManager.java index 6ff689a187d..b93db26a808 100644 --- a/solr/core/src/test/org/apache/solr/schema/TestSchemaManager.java +++ b/solr/core/src/test/org/apache/solr/schema/TestSchemaManager.java @@ -1,5 +1,3 @@ -package org.apache.solr.schema; - /* * 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.schema; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.schema; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.util.CommandOperation; diff --git a/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored.java b/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored.java index e3914c0b4b7..46f76ab8dec 100644 --- a/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored.java +++ b/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored.java @@ -1,5 +1,3 @@ -package org.apache.solr.schema; - /* * 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.schema; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.schema; import java.io.File; diff --git a/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored2.java b/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored2.java index 3011141f501..48c30b2645f 100644 --- a/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored2.java +++ b/solr/core/src/test/org/apache/solr/schema/TestUseDocValuesAsStored2.java @@ -1,5 +1,3 @@ -package org.apache.solr.schema; - /* * 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.schema; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.schema; import java.io.File; import java.io.StringReader; diff --git a/solr/core/src/test/org/apache/solr/schema/ThrowErrorOnInitFieldType.java b/solr/core/src/test/org/apache/solr/schema/ThrowErrorOnInitFieldType.java index 7745afb15df..0b5f78e78da 100644 --- a/solr/core/src/test/org/apache/solr/schema/ThrowErrorOnInitFieldType.java +++ b/solr/core/src/test/org/apache/solr/schema/ThrowErrorOnInitFieldType.java @@ -1,5 +1,3 @@ -package org.apache.solr.schema; - /* * 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.schema; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.schema; import java.util.Map; diff --git a/solr/core/src/test/org/apache/solr/schema/TrieIntPrefixActsAsRangeQueryFieldType.java b/solr/core/src/test/org/apache/solr/schema/TrieIntPrefixActsAsRangeQueryFieldType.java index d4dc81e761f..66280972545 100644 --- a/solr/core/src/test/org/apache/solr/schema/TrieIntPrefixActsAsRangeQueryFieldType.java +++ b/solr/core/src/test/org/apache/solr/schema/TrieIntPrefixActsAsRangeQueryFieldType.java @@ -1,5 +1,3 @@ -package org.apache.solr.schema; - /* * 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.schema; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.schema; import org.apache.lucene.search.Query; import org.apache.solr.search.QParser; diff --git a/solr/core/src/test/org/apache/solr/schema/WrappedIntField.java b/solr/core/src/test/org/apache/solr/schema/WrappedIntField.java index 7f52b3e3f4e..458ac03384b 100644 --- a/solr/core/src/test/org/apache/solr/schema/WrappedIntField.java +++ b/solr/core/src/test/org/apache/solr/schema/WrappedIntField.java @@ -1,5 +1,3 @@ -package org.apache.solr.schema; - /* * 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.schema; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.schema; import org.apache.lucene.expressions.Expression; import org.apache.lucene.expressions.SimpleBindings; diff --git a/solr/core/src/test/org/apache/solr/search/AnalyticsMergeStrategyTest.java b/solr/core/src/test/org/apache/solr/search/AnalyticsMergeStrategyTest.java index 3cc1d67a1c5..ed3318213d9 100644 --- a/solr/core/src/test/org/apache/solr/search/AnalyticsMergeStrategyTest.java +++ b/solr/core/src/test/org/apache/solr/search/AnalyticsMergeStrategyTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * 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.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; import org.apache.lucene.util.Constants; import org.apache.solr.BaseDistributedSearchTestCase; diff --git a/solr/core/src/test/org/apache/solr/search/AnalyticsQueryTest.java b/solr/core/src/test/org/apache/solr/search/AnalyticsQueryTest.java index 0b09f6bf982..f70dd7ea4d0 100644 --- a/solr/core/src/test/org/apache/solr/search/AnalyticsQueryTest.java +++ b/solr/core/src/test/org/apache/solr/search/AnalyticsQueryTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import org.apache.solr.SolrTestCaseJ4; diff --git a/solr/core/src/test/org/apache/solr/search/CursorMarkTest.java b/solr/core/src/test/org/apache/solr/search/CursorMarkTest.java index ab3ba529620..dab47ca4b0e 100644 --- a/solr/core/src/test/org/apache/solr/search/CursorMarkTest.java +++ b/solr/core/src/test/org/apache/solr/search/CursorMarkTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import org.apache.lucene.analysis.Analyzer; diff --git a/solr/core/src/test/org/apache/solr/search/DelayingSearchComponent.java b/solr/core/src/test/org/apache/solr/search/DelayingSearchComponent.java index c638badcf3f..76b22d926c8 100644 --- a/solr/core/src/test/org/apache/solr/search/DelayingSearchComponent.java +++ b/solr/core/src/test/org/apache/solr/search/DelayingSearchComponent.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * 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.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; import org.apache.solr.core.SolrInfoMBean; import org.apache.solr.handler.component.ResponseBuilder; diff --git a/solr/core/src/test/org/apache/solr/search/DocSetPerf.java b/solr/core/src/test/org/apache/solr/search/DocSetPerf.java index 1cd93f7df1d..e9fe9f79ebd 100644 --- a/solr/core/src/test/org/apache/solr/search/DocSetPerf.java +++ b/solr/core/src/test/org/apache/solr/search/DocSetPerf.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import java.util.Random; diff --git a/solr/core/src/test/org/apache/solr/search/FooQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/FooQParserPlugin.java index 2df670540b8..45c6d4f4e90 100644 --- a/solr/core/src/test/org/apache/solr/search/FooQParserPlugin.java +++ b/solr/core/src/test/org/apache/solr/search/FooQParserPlugin.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import org.apache.solr.common.params.SolrParams; diff --git a/solr/core/src/test/org/apache/solr/search/MergeStrategyTest.java b/solr/core/src/test/org/apache/solr/search/MergeStrategyTest.java index ee733c42100..ff73925b31c 100644 --- a/solr/core/src/test/org/apache/solr/search/MergeStrategyTest.java +++ b/solr/core/src/test/org/apache/solr/search/MergeStrategyTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * 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.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; import org.apache.solr.BaseDistributedSearchTestCase; import org.apache.solr.client.solrj.response.QueryResponse; diff --git a/solr/core/src/test/org/apache/solr/search/MockSearchComponent.java b/solr/core/src/test/org/apache/solr/search/MockSearchComponent.java index 44094133421..1539dfd919a 100644 --- a/solr/core/src/test/org/apache/solr/search/MockSearchComponent.java +++ b/solr/core/src/test/org/apache/solr/search/MockSearchComponent.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * 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.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java b/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java index 08fa3294577..a9b02098375 100644 --- a/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java +++ b/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java @@ -1,4 +1,3 @@ -package org.apache.solr.search; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.search; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.search; import org.apache.lucene.search.Query; import org.apache.lucene.search.QueryUtils; import org.apache.solr.SolrTestCaseJ4; diff --git a/solr/core/src/test/org/apache/solr/search/QueryParsingTest.java b/solr/core/src/test/org/apache/solr/search/QueryParsingTest.java index 0acb770f57d..2a7362d6776 100644 --- a/solr/core/src/test/org/apache/solr/search/QueryParsingTest.java +++ b/solr/core/src/test/org/apache/solr/search/QueryParsingTest.java @@ -1,4 +1,3 @@ -package org.apache.solr.search; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.search; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.search; import org.apache.lucene.search.Query; import org.apache.lucene.search.Sort; import org.apache.lucene.search.SortField; diff --git a/solr/core/src/test/org/apache/solr/search/RankQueryTest.java b/solr/core/src/test/org/apache/solr/search/RankQueryTest.java index c98e62ba575..9062070118d 100644 --- a/solr/core/src/test/org/apache/solr/search/RankQueryTest.java +++ b/solr/core/src/test/org/apache/solr/search/RankQueryTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import org.apache.solr.SolrTestCaseJ4; diff --git a/solr/core/src/test/org/apache/solr/search/ReturnFieldsTest.java b/solr/core/src/test/org/apache/solr/search/ReturnFieldsTest.java index 4b669c0c34c..f72aee8385d 100644 --- a/solr/core/src/test/org/apache/solr/search/ReturnFieldsTest.java +++ b/solr/core/src/test/org/apache/solr/search/ReturnFieldsTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import org.apache.lucene.util.TestUtil; diff --git a/solr/core/src/test/org/apache/solr/search/SortSpecParsingTest.java b/solr/core/src/test/org/apache/solr/search/SortSpecParsingTest.java index 05b820e1969..3c15018b0b8 100644 --- a/solr/core/src/test/org/apache/solr/search/SortSpecParsingTest.java +++ b/solr/core/src/test/org/apache/solr/search/SortSpecParsingTest.java @@ -1,4 +1,3 @@ -package org.apache.solr.search; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.search; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.search; import org.apache.lucene.search.Query; import org.apache.lucene.search.Sort; import org.apache.lucene.search.SortField; diff --git a/solr/core/src/test/org/apache/solr/search/SpatialFilterTest.java b/solr/core/src/test/org/apache/solr/search/SpatialFilterTest.java index 2898694e8eb..720f9b5cfd1 100644 --- a/solr/core/src/test/org/apache/solr/search/SpatialFilterTest.java +++ b/solr/core/src/test/org/apache/solr/search/SpatialFilterTest.java @@ -1,4 +1,3 @@ -package org.apache.solr.search; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,8 +14,7 @@ package org.apache.solr.search; * See the License for the specific language governing permissions and * limitations under the License. */ - - +package org.apache.solr.search; import org.apache.solr.SolrTestCaseJ4; import org.junit.BeforeClass; import org.junit.Test; diff --git a/solr/core/src/test/org/apache/solr/search/TestAddFieldRealTimeGet.java b/solr/core/src/test/org/apache/solr/search/TestAddFieldRealTimeGet.java index 475f9e98f62..34f7cdec6d0 100644 --- a/solr/core/src/test/org/apache/solr/search/TestAddFieldRealTimeGet.java +++ b/solr/core/src/test/org/apache/solr/search/TestAddFieldRealTimeGet.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * 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.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; import java.io.File; import java.util.Collections; diff --git a/solr/core/src/test/org/apache/solr/search/TestAnalyticsQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/TestAnalyticsQParserPlugin.java index 1a86f482a0a..cfd6b752b37 100644 --- a/solr/core/src/test/org/apache/solr/search/TestAnalyticsQParserPlugin.java +++ b/solr/core/src/test/org/apache/solr/search/TestAnalyticsQParserPlugin.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import org.apache.lucene.search.Query; diff --git a/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java index 163f114a88d..e34f3770b0d 100644 --- a/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java +++ b/solr/core/src/test/org/apache/solr/search/TestCollapseQParserPlugin.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import java.util.Collections; diff --git a/solr/core/src/test/org/apache/solr/search/TestComplexPhraseQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/TestComplexPhraseQParserPlugin.java index 8e12509e9b9..8c592813baf 100644 --- a/solr/core/src/test/org/apache/solr/search/TestComplexPhraseQParserPlugin.java +++ b/solr/core/src/test/org/apache/solr/search/TestComplexPhraseQParserPlugin.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * 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.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; import org.apache.solr.common.params.CommonParams; import org.apache.solr.common.params.HighlightParams; diff --git a/solr/core/src/test/org/apache/solr/search/TestComponentsName.java b/solr/core/src/test/org/apache/solr/search/TestComponentsName.java index 2507715f288..ce643d27e98 100644 --- a/solr/core/src/test/org/apache/solr/search/TestComponentsName.java +++ b/solr/core/src/test/org/apache/solr/search/TestComponentsName.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * 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.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.handler.component.DebugComponent; diff --git a/solr/core/src/test/org/apache/solr/search/TestCustomSort.java b/solr/core/src/test/org/apache/solr/search/TestCustomSort.java index d2afe4d3f6c..ca33ea0f4cf 100644 --- a/solr/core/src/test/org/apache/solr/search/TestCustomSort.java +++ b/solr/core/src/test/org/apache/solr/search/TestCustomSort.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * 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.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; import org.apache.solr.SolrTestCaseJ4; import org.junit.BeforeClass; diff --git a/solr/core/src/test/org/apache/solr/search/TestDocSet.java b/solr/core/src/test/org/apache/solr/search/TestDocSet.java index f435e6b5821..3d93099cbc0 100644 --- a/solr/core/src/test/org/apache/solr/search/TestDocSet.java +++ b/solr/core/src/test/org/apache/solr/search/TestDocSet.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/search/TestElisionMultitermQuery.java b/solr/core/src/test/org/apache/solr/search/TestElisionMultitermQuery.java index d8874c4382a..8807fae950f 100644 --- a/solr/core/src/test/org/apache/solr/search/TestElisionMultitermQuery.java +++ b/solr/core/src/test/org/apache/solr/search/TestElisionMultitermQuery.java @@ -1,9 +1,3 @@ -package org.apache.solr.search; - -import org.apache.solr.SolrTestCaseJ4; -import org.junit.BeforeClass; -import org.junit.Test; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -20,6 +14,11 @@ import org.junit.Test; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; + +import org.apache.solr.SolrTestCaseJ4; +import org.junit.BeforeClass; +import org.junit.Test; public class TestElisionMultitermQuery extends SolrTestCaseJ4 { diff --git a/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java b/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java index 8919fea5220..019c54d6372 100644 --- a/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java +++ b/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import java.util.HashSet; diff --git a/solr/core/src/test/org/apache/solr/search/TestFieldSortValues.java b/solr/core/src/test/org/apache/solr/search/TestFieldSortValues.java index eb57c9e918f..781127b92dd 100644 --- a/solr/core/src/test/org/apache/solr/search/TestFieldSortValues.java +++ b/solr/core/src/test/org/apache/solr/search/TestFieldSortValues.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * 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.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; import org.apache.solr.SolrTestCaseJ4; import org.junit.BeforeClass; diff --git a/solr/core/src/test/org/apache/solr/search/TestFilteredDocIdSet.java b/solr/core/src/test/org/apache/solr/search/TestFilteredDocIdSet.java index de3c849ce20..ec1ec78b6e7 100644 --- a/solr/core/src/test/org/apache/solr/search/TestFilteredDocIdSet.java +++ b/solr/core/src/test/org/apache/solr/search/TestFilteredDocIdSet.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * 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.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; import java.io.IOException; import java.util.ArrayList; diff --git a/solr/core/src/test/org/apache/solr/search/TestFiltering.java b/solr/core/src/test/org/apache/solr/search/TestFiltering.java index ad7d6738119..579361b45da 100644 --- a/solr/core/src/test/org/apache/solr/search/TestFiltering.java +++ b/solr/core/src/test/org/apache/solr/search/TestFiltering.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; diff --git a/solr/core/src/test/org/apache/solr/search/TestFoldingMultitermQuery.java b/solr/core/src/test/org/apache/solr/search/TestFoldingMultitermQuery.java index 08fcfa8d19b..fb982b871df 100644 --- a/solr/core/src/test/org/apache/solr/search/TestFoldingMultitermQuery.java +++ b/solr/core/src/test/org/apache/solr/search/TestFoldingMultitermQuery.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * 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.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; import org.apache.solr.SolrTestCaseJ4; import org.junit.BeforeClass; diff --git a/solr/core/src/test/org/apache/solr/search/TestHashQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/TestHashQParserPlugin.java index 877a28eb345..36e4fb19b36 100644 --- a/solr/core/src/test/org/apache/solr/search/TestHashQParserPlugin.java +++ b/solr/core/src/test/org/apache/solr/search/TestHashQParserPlugin.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import org.apache.lucene.util.FixedBitSet; diff --git a/solr/core/src/test/org/apache/solr/search/TestInitQParser.java b/solr/core/src/test/org/apache/solr/search/TestInitQParser.java index 651a2c53e52..d20c1d6c5eb 100644 --- a/solr/core/src/test/org/apache/solr/search/TestInitQParser.java +++ b/solr/core/src/test/org/apache/solr/search/TestInitQParser.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * 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.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; import org.apache.solr.SolrTestCaseJ4; import org.junit.Before; diff --git a/solr/core/src/test/org/apache/solr/search/TestLFUCache.java b/solr/core/src/test/org/apache/solr/search/TestLFUCache.java index be8e5c72edf..01f6da40395 100644 --- a/solr/core/src/test/org/apache/solr/search/TestLFUCache.java +++ b/solr/core/src/test/org/apache/solr/search/TestLFUCache.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * 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.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.common.util.ExecutorUtil; diff --git a/solr/core/src/test/org/apache/solr/search/TestLRUCache.java b/solr/core/src/test/org/apache/solr/search/TestLRUCache.java index 5763ca5ecac..8209e550861 100644 --- a/solr/core/src/test/org/apache/solr/search/TestLRUCache.java +++ b/solr/core/src/test/org/apache/solr/search/TestLRUCache.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * 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.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; import java.io.IOException; import java.io.Serializable; diff --git a/solr/core/src/test/org/apache/solr/search/TestMaxScoreQueryParser.java b/solr/core/src/test/org/apache/solr/search/TestMaxScoreQueryParser.java index 088fa7c460e..32e3eb207c7 100644 --- a/solr/core/src/test/org/apache/solr/search/TestMaxScoreQueryParser.java +++ b/solr/core/src/test/org/apache/solr/search/TestMaxScoreQueryParser.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * 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.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; import org.apache.lucene.index.Term; import org.apache.lucene.search.*; diff --git a/solr/core/src/test/org/apache/solr/search/TestMissingGroups.java b/solr/core/src/test/org/apache/solr/search/TestMissingGroups.java index b9e3968260d..caecb471018 100644 --- a/solr/core/src/test/org/apache/solr/search/TestMissingGroups.java +++ b/solr/core/src/test/org/apache/solr/search/TestMissingGroups.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import org.apache.solr.SolrTestCaseJ4; diff --git a/solr/core/src/test/org/apache/solr/search/TestNoOpRegenerator.java b/solr/core/src/test/org/apache/solr/search/TestNoOpRegenerator.java index 4b7b45b7489..662e849cd09 100644 --- a/solr/core/src/test/org/apache/solr/search/TestNoOpRegenerator.java +++ b/solr/core/src/test/org/apache/solr/search/TestNoOpRegenerator.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * 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.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.util.RefCounted; diff --git a/solr/core/src/test/org/apache/solr/search/TestOverriddenPrefixQueryForCustomFieldType.java b/solr/core/src/test/org/apache/solr/search/TestOverriddenPrefixQueryForCustomFieldType.java index 3952c4fc9e2..42b0d37cf3c 100644 --- a/solr/core/src/test/org/apache/solr/search/TestOverriddenPrefixQueryForCustomFieldType.java +++ b/solr/core/src/test/org/apache/solr/search/TestOverriddenPrefixQueryForCustomFieldType.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * 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.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; import org.apache.lucene.search.*; import org.apache.solr.SolrTestCaseJ4; diff --git a/solr/core/src/test/org/apache/solr/search/TestPseudoReturnFields.java b/solr/core/src/test/org/apache/solr/search/TestPseudoReturnFields.java index f0a68a65a24..451bc5f92fa 100644 --- a/solr/core/src/test/org/apache/solr/search/TestPseudoReturnFields.java +++ b/solr/core/src/test/org/apache/solr/search/TestPseudoReturnFields.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import org.apache.solr.SolrTestCaseJ4; diff --git a/solr/core/src/test/org/apache/solr/search/TestQueryUtils.java b/solr/core/src/test/org/apache/solr/search/TestQueryUtils.java index 288596592a8..d40292f161c 100644 --- a/solr/core/src/test/org/apache/solr/search/TestQueryUtils.java +++ b/solr/core/src/test/org/apache/solr/search/TestQueryUtils.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import org.apache.lucene.search.TermQuery; diff --git a/solr/core/src/test/org/apache/solr/search/TestQueryWrapperFilter.java b/solr/core/src/test/org/apache/solr/search/TestQueryWrapperFilter.java index f71abd265de..eb911c41d36 100644 --- a/solr/core/src/test/org/apache/solr/search/TestQueryWrapperFilter.java +++ b/solr/core/src/test/org/apache/solr/search/TestQueryWrapperFilter.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.solr.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; + import java.io.IOException; import java.util.HashSet; import java.util.Set; diff --git a/solr/core/src/test/org/apache/solr/search/TestRandomCollapseQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/TestRandomCollapseQParserPlugin.java index 66a637af2a8..2ba79e0ab6c 100644 --- a/solr/core/src/test/org/apache/solr/search/TestRandomCollapseQParserPlugin.java +++ b/solr/core/src/test/org/apache/solr/search/TestRandomCollapseQParserPlugin.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import java.util.List; diff --git a/solr/core/src/test/org/apache/solr/search/TestRankQueryPlugin.java b/solr/core/src/test/org/apache/solr/search/TestRankQueryPlugin.java index dd42b577aa5..36575c739f1 100644 --- a/solr/core/src/test/org/apache/solr/search/TestRankQueryPlugin.java +++ b/solr/core/src/test/org/apache/solr/search/TestRankQueryPlugin.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/search/TestReRankQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/TestReRankQParserPlugin.java index 9efbad80a5f..9a77c138bb9 100644 --- a/solr/core/src/test/org/apache/solr/search/TestReRankQParserPlugin.java +++ b/solr/core/src/test/org/apache/solr/search/TestReRankQParserPlugin.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import org.apache.solr.SolrTestCaseJ4; diff --git a/solr/core/src/test/org/apache/solr/search/TestReloadDeadlock.java b/solr/core/src/test/org/apache/solr/search/TestReloadDeadlock.java index e00901d70cd..b79caa6aa5e 100644 --- a/solr/core/src/test/org/apache/solr/search/TestReloadDeadlock.java +++ b/solr/core/src/test/org/apache/solr/search/TestReloadDeadlock.java @@ -1,6 +1,3 @@ -package org.apache.solr.search; - - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +14,8 @@ package org.apache.solr.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; + import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite; import org.apache.lucene.util.LuceneTestCase.Nightly; diff --git a/solr/core/src/test/org/apache/solr/search/TestSearchPerf.java b/solr/core/src/test/org/apache/solr/search/TestSearchPerf.java index cfdb8a48dd0..dd566e0c3f3 100644 --- a/solr/core/src/test/org/apache/solr/search/TestSearchPerf.java +++ b/solr/core/src/test/org/apache/solr/search/TestSearchPerf.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import org.apache.lucene.index.Term; diff --git a/solr/core/src/test/org/apache/solr/search/TestSimpleQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/TestSimpleQParserPlugin.java index 3a9047de87a..795d8b2b3b0 100644 --- a/solr/core/src/test/org/apache/solr/search/TestSimpleQParserPlugin.java +++ b/solr/core/src/test/org/apache/solr/search/TestSimpleQParserPlugin.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * 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.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; import org.apache.lucene.index.Term; import org.apache.lucene.search.PrefixQuery; diff --git a/solr/core/src/test/org/apache/solr/search/TestSmileRequest.java b/solr/core/src/test/org/apache/solr/search/TestSmileRequest.java index 433d22536fb..78760dac770 100644 --- a/solr/core/src/test/org/apache/solr/search/TestSmileRequest.java +++ b/solr/core/src/test/org/apache/solr/search/TestSmileRequest.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,7 +14,7 @@ package org.apache.solr.search; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.search; import java.io.IOException; import java.io.InputStream; diff --git a/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial.java b/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial.java index 85874391802..20555c6fa50 100644 --- a/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial.java +++ b/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * 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.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; import java.text.ParseException; import java.util.Arrays; diff --git a/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial2.java b/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial2.java index cb6ebc82d01..c97f7a68001 100644 --- a/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial2.java +++ b/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial2.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * 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.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.common.SolrException; diff --git a/solr/core/src/test/org/apache/solr/search/TestSolrJ.java b/solr/core/src/test/org/apache/solr/search/TestSolrJ.java index b8d132d0c96..b70205efd47 100644 --- a/solr/core/src/test/org/apache/solr/search/TestSolrJ.java +++ b/solr/core/src/test/org/apache/solr/search/TestSolrJ.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; diff --git a/solr/core/src/test/org/apache/solr/search/TestSort.java b/solr/core/src/test/org/apache/solr/search/TestSort.java index cb52e3d52b8..94a6fd0baf0 100644 --- a/solr/core/src/test/org/apache/solr/search/TestSort.java +++ b/solr/core/src/test/org/apache/solr/search/TestSort.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/search/TestStandardQParsers.java b/solr/core/src/test/org/apache/solr/search/TestStandardQParsers.java index d65e09a3b9b..4c7c4c1a7f5 100644 --- a/solr/core/src/test/org/apache/solr/search/TestStandardQParsers.java +++ b/solr/core/src/test/org/apache/solr/search/TestStandardQParsers.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * 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.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; import org.apache.lucene.util.LuceneTestCase; import org.junit.Test; diff --git a/solr/core/src/test/org/apache/solr/search/TestStressUserVersions.java b/solr/core/src/test/org/apache/solr/search/TestStressUserVersions.java index fd878a27feb..e098ecc445d 100644 --- a/solr/core/src/test/org/apache/solr/search/TestStressUserVersions.java +++ b/solr/core/src/test/org/apache/solr/search/TestStressUserVersions.java @@ -1,6 +1,3 @@ -package org.apache.solr.search; - - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +14,8 @@ package org.apache.solr.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; + import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.util.TestHarness; diff --git a/solr/core/src/test/org/apache/solr/search/TestSurroundQueryParser.java b/solr/core/src/test/org/apache/solr/search/TestSurroundQueryParser.java index 196880896be..7b01a736403 100644 --- a/solr/core/src/test/org/apache/solr/search/TestSurroundQueryParser.java +++ b/solr/core/src/test/org/apache/solr/search/TestSurroundQueryParser.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * 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.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; import org.apache.solr.util.AbstractSolrTestCase; import org.junit.BeforeClass; diff --git a/solr/core/src/test/org/apache/solr/search/TestTrieFacet.java b/solr/core/src/test/org/apache/solr/search/TestTrieFacet.java index b647a66863a..158965b6aac 100644 --- a/solr/core/src/test/org/apache/solr/search/TestTrieFacet.java +++ b/solr/core/src/test/org/apache/solr/search/TestTrieFacet.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search; import org.apache.lucene.util.TestUtil; diff --git a/solr/core/src/test/org/apache/solr/search/TestValueSourceCache.java b/solr/core/src/test/org/apache/solr/search/TestValueSourceCache.java index 57c40645817..7056064063a 100644 --- a/solr/core/src/test/org/apache/solr/search/TestValueSourceCache.java +++ b/solr/core/src/test/org/apache/solr/search/TestValueSourceCache.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * 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.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; import org.apache.lucene.search.Query; import org.apache.lucene.search.QueryUtils; diff --git a/solr/core/src/test/org/apache/solr/search/TestXmlQParser.java b/solr/core/src/test/org/apache/solr/search/TestXmlQParser.java index 847b47d9e23..e7237b32ccc 100755 --- a/solr/core/src/test/org/apache/solr/search/TestXmlQParser.java +++ b/solr/core/src/test/org/apache/solr/search/TestXmlQParser.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -8,7 +6,7 @@ package org.apache.solr.search; * (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 + * 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, @@ -16,6 +14,7 @@ package org.apache.solr.search; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search; import org.apache.lucene.queryparser.xml.CoreParser; import org.apache.lucene.queryparser.xml.TestCoreParser; diff --git a/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java b/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java index 45c9845c845..9982d724897 100644 --- a/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java +++ b/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.facet; - /* * 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.search.facet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.facet; import java.nio.ByteBuffer; import java.util.ArrayList; diff --git a/solr/core/src/test/org/apache/solr/search/function/NvlValueSourceParser.java b/solr/core/src/test/org/apache/solr/search/function/NvlValueSourceParser.java index f56ad15edec..9c458e282df 100644 --- a/solr/core/src/test/org/apache/solr/search/function/NvlValueSourceParser.java +++ b/solr/core/src/test/org/apache/solr/search/function/NvlValueSourceParser.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search.function; import org.apache.lucene.queries.function.FunctionValues; diff --git a/solr/core/src/test/org/apache/solr/search/function/SortByFunctionTest.java b/solr/core/src/test/org/apache/solr/search/function/SortByFunctionTest.java index 3d12b44297c..e28c95719c4 100644 --- a/solr/core/src/test/org/apache/solr/search/function/SortByFunctionTest.java +++ b/solr/core/src/test/org/apache/solr/search/function/SortByFunctionTest.java @@ -1,4 +1,3 @@ -package org.apache.solr.search.function; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.search.function; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.search.function; import org.apache.solr.util.AbstractSolrTestCase; import org.junit.BeforeClass; diff --git a/solr/core/src/test/org/apache/solr/search/function/TestFunctionQuery.java b/solr/core/src/test/org/apache/solr/search/function/TestFunctionQuery.java index d74a145626d..cc9dcceffd1 100644 --- a/solr/core/src/test/org/apache/solr/search/function/TestFunctionQuery.java +++ b/solr/core/src/test/org/apache/solr/search/function/TestFunctionQuery.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search.function; import java.io.FileOutputStream; diff --git a/solr/core/src/test/org/apache/solr/search/function/TestMinMaxOnMultiValuedField.java b/solr/core/src/test/org/apache/solr/search/function/TestMinMaxOnMultiValuedField.java index 5fbe4d43962..a9ed68081fb 100644 --- a/solr/core/src/test/org/apache/solr/search/function/TestMinMaxOnMultiValuedField.java +++ b/solr/core/src/test/org/apache/solr/search/function/TestMinMaxOnMultiValuedField.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search.function; import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; diff --git a/solr/core/src/test/org/apache/solr/search/function/TestOrdValues.java b/solr/core/src/test/org/apache/solr/search/function/TestOrdValues.java index 2848dc4e0e2..4b3ee1a67ed 100644 --- a/solr/core/src/test/org/apache/solr/search/function/TestOrdValues.java +++ b/solr/core/src/test/org/apache/solr/search/function/TestOrdValues.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.function; - /* * 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.search.function; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.function; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.MockAnalyzer; diff --git a/solr/core/src/test/org/apache/solr/search/function/TestSortByMinMaxFunction.java b/solr/core/src/test/org/apache/solr/search/function/TestSortByMinMaxFunction.java index ff780362eba..13ac8a312d1 100644 --- a/solr/core/src/test/org/apache/solr/search/function/TestSortByMinMaxFunction.java +++ b/solr/core/src/test/org/apache/solr/search/function/TestSortByMinMaxFunction.java @@ -1,4 +1,3 @@ -package org.apache.solr.search.function; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.search.function; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.search.function; import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; import org.apache.solr.util.AbstractSolrTestCase; import org.junit.BeforeClass; diff --git a/solr/core/src/test/org/apache/solr/search/function/distance/DistanceFunctionTest.java b/solr/core/src/test/org/apache/solr/search/function/distance/DistanceFunctionTest.java index 2742e3d5986..f33bc2a686f 100644 --- a/solr/core/src/test/org/apache/solr/search/function/distance/DistanceFunctionTest.java +++ b/solr/core/src/test/org/apache/solr/search/function/distance/DistanceFunctionTest.java @@ -1,4 +1,3 @@ -package org.apache.solr.search.function.distance; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.search.function.distance; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.search.function.distance; import com.spatial4j.core.distance.DistanceUtils; import com.spatial4j.core.io.GeohashUtils; import org.apache.solr.SolrTestCaseJ4; diff --git a/solr/core/src/test/org/apache/solr/search/join/BJQParserTest.java b/solr/core/src/test/org/apache/solr/search/join/BJQParserTest.java index 0d0d6c3a6fd..deb8a8daf59 100644 --- a/solr/core/src/test/org/apache/solr/search/join/BJQParserTest.java +++ b/solr/core/src/test/org/apache/solr/search/join/BJQParserTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search.join; import org.apache.lucene.search.join.ScoreMode; diff --git a/solr/core/src/test/org/apache/solr/search/join/BlockJoinFacetDistribTest.java b/solr/core/src/test/org/apache/solr/search/join/BlockJoinFacetDistribTest.java index c74e7c04376..1650f9cf7b4 100644 --- a/solr/core/src/test/org/apache/solr/search/join/BlockJoinFacetDistribTest.java +++ b/solr/core/src/test/org/apache/solr/search/join/BlockJoinFacetDistribTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.join; - /* * 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.search.join; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.join; import java.util.Arrays; import java.util.Collections; diff --git a/solr/core/src/test/org/apache/solr/search/join/BlockJoinFacetRandomTest.java b/solr/core/src/test/org/apache/solr/search/join/BlockJoinFacetRandomTest.java index 0ebbb9d9ea3..4e6fdb1de8a 100644 --- a/solr/core/src/test/org/apache/solr/search/join/BlockJoinFacetRandomTest.java +++ b/solr/core/src/test/org/apache/solr/search/join/BlockJoinFacetRandomTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.join; - /* * 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.search.join; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.join; import java.util.ArrayList; import java.util.Arrays; diff --git a/solr/core/src/test/org/apache/solr/search/join/BlockJoinFacetSimpleTest.java b/solr/core/src/test/org/apache/solr/search/join/BlockJoinFacetSimpleTest.java index 13a522820f7..a34e1d9c295 100644 --- a/solr/core/src/test/org/apache/solr/search/join/BlockJoinFacetSimpleTest.java +++ b/solr/core/src/test/org/apache/solr/search/join/BlockJoinFacetSimpleTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.join; - /* * 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.search.join; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.join; import java.util.ArrayList; import java.util.Arrays; diff --git a/solr/core/src/test/org/apache/solr/search/join/GraphQueryTest.java b/solr/core/src/test/org/apache/solr/search/join/GraphQueryTest.java index 1f5de65f701..357363c0c4a 100644 --- a/solr/core/src/test/org/apache/solr/search/join/GraphQueryTest.java +++ b/solr/core/src/test/org/apache/solr/search/join/GraphQueryTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.join; - /* * 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.search.join; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.join; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.common.params.SolrParams; diff --git a/solr/core/src/test/org/apache/solr/search/join/TestScoreJoinQPNoScore.java b/solr/core/src/test/org/apache/solr/search/join/TestScoreJoinQPNoScore.java index 53d7a744c81..52b139c855b 100644 --- a/solr/core/src/test/org/apache/solr/search/join/TestScoreJoinQPNoScore.java +++ b/solr/core/src/test/org/apache/solr/search/join/TestScoreJoinQPNoScore.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search.join; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/search/join/TestScoreJoinQPScore.java b/solr/core/src/test/org/apache/solr/search/join/TestScoreJoinQPScore.java index fa790c80131..45c7134bfdc 100644 --- a/solr/core/src/test/org/apache/solr/search/join/TestScoreJoinQPScore.java +++ b/solr/core/src/test/org/apache/solr/search/join/TestScoreJoinQPScore.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.search.join; import java.util.ArrayList; diff --git a/solr/core/src/test/org/apache/solr/search/json/TestJsonRequest.java b/solr/core/src/test/org/apache/solr/search/json/TestJsonRequest.java index 2544a76244c..370ae7e5ff5 100644 --- a/solr/core/src/test/org/apache/solr/search/json/TestJsonRequest.java +++ b/solr/core/src/test/org/apache/solr/search/json/TestJsonRequest.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.json; - /* * 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.search.json; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.json; import org.apache.lucene.util.LuceneTestCase; import org.apache.solr.JSONTestUtil; diff --git a/solr/core/src/test/org/apache/solr/search/mlt/CloudMLTQParserTest.java b/solr/core/src/test/org/apache/solr/search/mlt/CloudMLTQParserTest.java index c19aaf95810..6ed655f8370 100644 --- a/solr/core/src/test/org/apache/solr/search/mlt/CloudMLTQParserTest.java +++ b/solr/core/src/test/org/apache/solr/search/mlt/CloudMLTQParserTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.mlt; - /* * 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.search.mlt; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.mlt; import java.io.IOException; import java.util.ArrayList; diff --git a/solr/core/src/test/org/apache/solr/search/mlt/SimpleMLTQParserTest.java b/solr/core/src/test/org/apache/solr/search/mlt/SimpleMLTQParserTest.java index fbd63e4ef27..a524388ec12 100644 --- a/solr/core/src/test/org/apache/solr/search/mlt/SimpleMLTQParserTest.java +++ b/solr/core/src/test/org/apache/solr/search/mlt/SimpleMLTQParserTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.mlt; - /* * 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.search.mlt; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.mlt; import java.util.ArrayList; diff --git a/solr/core/src/test/org/apache/solr/search/similarities/BaseSimilarityTestCase.java b/solr/core/src/test/org/apache/solr/search/similarities/BaseSimilarityTestCase.java index 302794c1442..d782c2f70d4 100644 --- a/solr/core/src/test/org/apache/solr/search/similarities/BaseSimilarityTestCase.java +++ b/solr/core/src/test/org/apache/solr/search/similarities/BaseSimilarityTestCase.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.similarities; - /* * 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.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.similarities; import org.apache.lucene.search.similarities.PerFieldSimilarityWrapper; import org.apache.lucene.search.similarities.Similarity; diff --git a/solr/core/src/test/org/apache/solr/search/similarities/TestBM25SimilarityFactory.java b/solr/core/src/test/org/apache/solr/search/similarities/TestBM25SimilarityFactory.java index 2b893bc5b1f..3f6deacec42 100644 --- a/solr/core/src/test/org/apache/solr/search/similarities/TestBM25SimilarityFactory.java +++ b/solr/core/src/test/org/apache/solr/search/similarities/TestBM25SimilarityFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.similarities; - /* * 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.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.similarities; import org.apache.lucene.search.similarities.BM25Similarity; import org.apache.lucene.search.similarities.Similarity; diff --git a/solr/core/src/test/org/apache/solr/search/similarities/TestClassicSimilarityFactory.java b/solr/core/src/test/org/apache/solr/search/similarities/TestClassicSimilarityFactory.java index feafd3311be..6bd0c887fa0 100644 --- a/solr/core/src/test/org/apache/solr/search/similarities/TestClassicSimilarityFactory.java +++ b/solr/core/src/test/org/apache/solr/search/similarities/TestClassicSimilarityFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.similarities; - /* * 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.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.similarities; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.search.similarities.Similarity; diff --git a/solr/core/src/test/org/apache/solr/search/similarities/TestDFISimilarityFactory.java b/solr/core/src/test/org/apache/solr/search/similarities/TestDFISimilarityFactory.java index cd5a342a928..c53ec37125d 100644 --- a/solr/core/src/test/org/apache/solr/search/similarities/TestDFISimilarityFactory.java +++ b/solr/core/src/test/org/apache/solr/search/similarities/TestDFISimilarityFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.similarities; - /* * 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.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.similarities; import org.apache.lucene.search.similarities.DFISimilarity; import org.apache.lucene.search.similarities.IndependenceChiSquared; diff --git a/solr/core/src/test/org/apache/solr/search/similarities/TestDFRSimilarityFactory.java b/solr/core/src/test/org/apache/solr/search/similarities/TestDFRSimilarityFactory.java index 47dd14fb9f2..86659616c5b 100644 --- a/solr/core/src/test/org/apache/solr/search/similarities/TestDFRSimilarityFactory.java +++ b/solr/core/src/test/org/apache/solr/search/similarities/TestDFRSimilarityFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.similarities; - /* * 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.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.similarities; import org.apache.lucene.search.similarities.AfterEffectB; import org.apache.lucene.search.similarities.AfterEffectL; diff --git a/solr/core/src/test/org/apache/solr/search/similarities/TestIBSimilarityFactory.java b/solr/core/src/test/org/apache/solr/search/similarities/TestIBSimilarityFactory.java index d857993bde4..8e881cba5c7 100644 --- a/solr/core/src/test/org/apache/solr/search/similarities/TestIBSimilarityFactory.java +++ b/solr/core/src/test/org/apache/solr/search/similarities/TestIBSimilarityFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.similarities; - /* * 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.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.similarities; import org.apache.lucene.search.similarities.DistributionLL; import org.apache.lucene.search.similarities.DistributionSPL; diff --git a/solr/core/src/test/org/apache/solr/search/similarities/TestLMDirichletSimilarityFactory.java b/solr/core/src/test/org/apache/solr/search/similarities/TestLMDirichletSimilarityFactory.java index 318fc713ed0..3f75764b4ab 100644 --- a/solr/core/src/test/org/apache/solr/search/similarities/TestLMDirichletSimilarityFactory.java +++ b/solr/core/src/test/org/apache/solr/search/similarities/TestLMDirichletSimilarityFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.similarities; - /* * 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.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.similarities; import org.apache.lucene.search.similarities.LMDirichletSimilarity; import org.apache.lucene.search.similarities.Similarity; diff --git a/solr/core/src/test/org/apache/solr/search/similarities/TestLMJelinekMercerSimilarityFactory.java b/solr/core/src/test/org/apache/solr/search/similarities/TestLMJelinekMercerSimilarityFactory.java index d56ad28943c..9e7eeaf3acb 100644 --- a/solr/core/src/test/org/apache/solr/search/similarities/TestLMJelinekMercerSimilarityFactory.java +++ b/solr/core/src/test/org/apache/solr/search/similarities/TestLMJelinekMercerSimilarityFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.similarities; - /* * 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.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.similarities; import org.apache.lucene.search.similarities.LMJelinekMercerSimilarity; import org.apache.lucene.search.similarities.Similarity; diff --git a/solr/core/src/test/org/apache/solr/search/similarities/TestNonDefinedSimilarityFactory.java b/solr/core/src/test/org/apache/solr/search/similarities/TestNonDefinedSimilarityFactory.java index 86060a71337..355e77688bf 100644 --- a/solr/core/src/test/org/apache/solr/search/similarities/TestNonDefinedSimilarityFactory.java +++ b/solr/core/src/test/org/apache/solr/search/similarities/TestNonDefinedSimilarityFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.similarities; - /* * 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.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.similarities; import org.apache.lucene.search.similarities.ClassicSimilarity; import org.apache.lucene.search.similarities.BM25Similarity; diff --git a/solr/core/src/test/org/apache/solr/search/similarities/TestPerFieldSimilarity.java b/solr/core/src/test/org/apache/solr/search/similarities/TestPerFieldSimilarity.java index e01aed462da..8fe16e0fbc3 100644 --- a/solr/core/src/test/org/apache/solr/search/similarities/TestPerFieldSimilarity.java +++ b/solr/core/src/test/org/apache/solr/search/similarities/TestPerFieldSimilarity.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.similarities; - /* * 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.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.similarities; import org.apache.lucene.misc.SweetSpotSimilarity; import org.apache.lucene.search.similarities.BM25Similarity; diff --git a/solr/core/src/test/org/apache/solr/search/similarities/TestPerFieldSimilarityClassic.java b/solr/core/src/test/org/apache/solr/search/similarities/TestPerFieldSimilarityClassic.java index 07bf7764256..502552068b7 100644 --- a/solr/core/src/test/org/apache/solr/search/similarities/TestPerFieldSimilarityClassic.java +++ b/solr/core/src/test/org/apache/solr/search/similarities/TestPerFieldSimilarityClassic.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.similarities; - /* * 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.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.similarities; import org.apache.lucene.misc.SweetSpotSimilarity; import org.apache.lucene.search.similarities.ClassicSimilarity; diff --git a/solr/core/src/test/org/apache/solr/search/similarities/TestPerFieldSimilarityWithDefaultOverride.java b/solr/core/src/test/org/apache/solr/search/similarities/TestPerFieldSimilarityWithDefaultOverride.java index 84cbef597a8..27075fe9573 100644 --- a/solr/core/src/test/org/apache/solr/search/similarities/TestPerFieldSimilarityWithDefaultOverride.java +++ b/solr/core/src/test/org/apache/solr/search/similarities/TestPerFieldSimilarityWithDefaultOverride.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.similarities; - /* * 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.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.similarities; import org.apache.lucene.misc.SweetSpotSimilarity; import org.apache.lucene.search.similarities.BM25Similarity; diff --git a/solr/core/src/test/org/apache/solr/search/similarities/TestSweetSpotSimilarityFactory.java b/solr/core/src/test/org/apache/solr/search/similarities/TestSweetSpotSimilarityFactory.java index cd07d1afd94..7acd05a1f90 100644 --- a/solr/core/src/test/org/apache/solr/search/similarities/TestSweetSpotSimilarityFactory.java +++ b/solr/core/src/test/org/apache/solr/search/similarities/TestSweetSpotSimilarityFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.similarities; - /* * 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.search.similarities; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.similarities; import org.apache.lucene.misc.SweetSpotSimilarity; import org.apache.lucene.search.similarities.ClassicSimilarity; diff --git a/solr/core/src/test/org/apache/solr/search/stats/TestBaseStatsCache.java b/solr/core/src/test/org/apache/solr/search/stats/TestBaseStatsCache.java index b15172325f4..33ceb5b0342 100644 --- a/solr/core/src/test/org/apache/solr/search/stats/TestBaseStatsCache.java +++ b/solr/core/src/test/org/apache/solr/search/stats/TestBaseStatsCache.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.stats; - /* * 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.search.stats; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.stats; import org.apache.solr.client.solrj.response.QueryResponse; import org.apache.solr.common.SolrDocument; diff --git a/solr/core/src/test/org/apache/solr/search/stats/TestDefaultStatsCache.java b/solr/core/src/test/org/apache/solr/search/stats/TestDefaultStatsCache.java index 22694b54b36..955385e39a0 100644 --- a/solr/core/src/test/org/apache/solr/search/stats/TestDefaultStatsCache.java +++ b/solr/core/src/test/org/apache/solr/search/stats/TestDefaultStatsCache.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.stats; - /* * 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.search.stats; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.stats; import org.apache.solr.BaseDistributedSearchTestCase; import org.apache.solr.client.solrj.SolrClient; diff --git a/solr/core/src/test/org/apache/solr/search/stats/TestDistribIDF.java b/solr/core/src/test/org/apache/solr/search/stats/TestDistribIDF.java index 2e7ef998040..9bb4d21eec2 100644 --- a/solr/core/src/test/org/apache/solr/search/stats/TestDistribIDF.java +++ b/solr/core/src/test/org/apache/solr/search/stats/TestDistribIDF.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.stats; - /* * 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.search.stats; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.stats; import java.io.File; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/search/stats/TestExactSharedStatsCache.java b/solr/core/src/test/org/apache/solr/search/stats/TestExactSharedStatsCache.java index 4d9e46c2675..7e3f0965823 100644 --- a/solr/core/src/test/org/apache/solr/search/stats/TestExactSharedStatsCache.java +++ b/solr/core/src/test/org/apache/solr/search/stats/TestExactSharedStatsCache.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.stats; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.solr.search.stats; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.stats; + public class TestExactSharedStatsCache extends TestBaseStatsCache { @Override diff --git a/solr/core/src/test/org/apache/solr/search/stats/TestExactStatsCache.java b/solr/core/src/test/org/apache/solr/search/stats/TestExactStatsCache.java index 7307af20d95..bec4747e486 100644 --- a/solr/core/src/test/org/apache/solr/search/stats/TestExactStatsCache.java +++ b/solr/core/src/test/org/apache/solr/search/stats/TestExactStatsCache.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.stats; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.solr.search.stats; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.stats; + public class TestExactStatsCache extends TestBaseStatsCache { @Override protected String getStatsCacheClassName() { diff --git a/solr/core/src/test/org/apache/solr/search/stats/TestLRUStatsCache.java b/solr/core/src/test/org/apache/solr/search/stats/TestLRUStatsCache.java index f807103b293..d3156f6418f 100644 --- a/solr/core/src/test/org/apache/solr/search/stats/TestLRUStatsCache.java +++ b/solr/core/src/test/org/apache/solr/search/stats/TestLRUStatsCache.java @@ -1,5 +1,3 @@ -package org.apache.solr.search.stats; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,6 +14,8 @@ package org.apache.solr.search.stats; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.search.stats; + public class TestLRUStatsCache extends TestBaseStatsCache { @Override protected String getStatsCacheClassName() { diff --git a/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java b/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java index 9fca48e79eb..c5d27a9a544 100644 --- a/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java +++ b/solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.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 @@ -16,7 +14,7 @@ package org.apache.solr.security; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.security; import java.lang.invoke.MethodHandles; import java.util.ArrayList; diff --git a/solr/core/src/test/org/apache/solr/security/MockAuthenticationPlugin.java b/solr/core/src/test/org/apache/solr/security/MockAuthenticationPlugin.java index 87767a15fbe..e3cf7bdd1b7 100644 --- a/solr/core/src/test/org/apache/solr/security/MockAuthenticationPlugin.java +++ b/solr/core/src/test/org/apache/solr/security/MockAuthenticationPlugin.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 @@ -16,7 +14,7 @@ package org.apache.solr.security; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.security; import javax.servlet.FilterChain; import javax.servlet.ServletException; diff --git a/solr/core/src/test/org/apache/solr/security/MockAuthorizationPlugin.java b/solr/core/src/test/org/apache/solr/security/MockAuthorizationPlugin.java index 2327c3a2886..f307553e81f 100644 --- a/solr/core/src/test/org/apache/solr/security/MockAuthorizationPlugin.java +++ b/solr/core/src/test/org/apache/solr/security/MockAuthorizationPlugin.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 @@ -16,6 +14,7 @@ package org.apache.solr.security; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.security; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/test/org/apache/solr/security/PKIAuthenticationIntegrationTest.java b/solr/core/src/test/org/apache/solr/security/PKIAuthenticationIntegrationTest.java index 6b50f0b6fe9..26aee070d9a 100644 --- a/solr/core/src/test/org/apache/solr/security/PKIAuthenticationIntegrationTest.java +++ b/solr/core/src/test/org/apache/solr/security/PKIAuthenticationIntegrationTest.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 @@ -16,7 +14,7 @@ package org.apache.solr.security; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.security; import javax.servlet.ServletRequest; import javax.servlet.http.HttpServletRequest; diff --git a/solr/core/src/test/org/apache/solr/security/TestAuthorizationFramework.java b/solr/core/src/test/org/apache/solr/security/TestAuthorizationFramework.java index e0acb17aecd..3f573767981 100644 --- a/solr/core/src/test/org/apache/solr/security/TestAuthorizationFramework.java +++ b/solr/core/src/test/org/apache/solr/security/TestAuthorizationFramework.java @@ -1,7 +1,3 @@ -package org.apache.solr.security; - -import java.lang.invoke.MethodHandles; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import java.lang.invoke.MethodHandles; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.security; + +import java.lang.invoke.MethodHandles; import java.util.List; import java.util.Map; diff --git a/solr/core/src/test/org/apache/solr/security/TestPKIAuthenticationPlugin.java b/solr/core/src/test/org/apache/solr/security/TestPKIAuthenticationPlugin.java index 7029d92a3b8..ba7d46d7d43 100644 --- a/solr/core/src/test/org/apache/solr/security/TestPKIAuthenticationPlugin.java +++ b/solr/core/src/test/org/apache/solr/security/TestPKIAuthenticationPlugin.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 @@ -16,6 +14,7 @@ package org.apache.solr.security; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.security; import javax.servlet.FilterChain; import javax.servlet.ServletException; diff --git a/solr/core/src/test/org/apache/solr/security/TestRuleBasedAuthorizationPlugin.java b/solr/core/src/test/org/apache/solr/security/TestRuleBasedAuthorizationPlugin.java index e05e2d9f2d0..62f4db407b6 100644 --- a/solr/core/src/test/org/apache/solr/security/TestRuleBasedAuthorizationPlugin.java +++ b/solr/core/src/test/org/apache/solr/security/TestRuleBasedAuthorizationPlugin.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 @@ -16,6 +14,7 @@ package org.apache.solr.security; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.security; import java.security.Principal; import java.util.Enumeration; diff --git a/solr/core/src/test/org/apache/solr/security/TestSha256AuthenticationProvider.java b/solr/core/src/test/org/apache/solr/security/TestSha256AuthenticationProvider.java index 2415099e568..adcccda889a 100644 --- a/solr/core/src/test/org/apache/solr/security/TestSha256AuthenticationProvider.java +++ b/solr/core/src/test/org/apache/solr/security/TestSha256AuthenticationProvider.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 @@ -16,6 +14,7 @@ package org.apache.solr.security; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.security; import java.util.Collections; import java.util.LinkedHashMap; diff --git a/solr/core/src/test/org/apache/solr/servlet/DirectSolrConnectionTest.java b/solr/core/src/test/org/apache/solr/servlet/DirectSolrConnectionTest.java index bd566fcf592..8c7217f35a0 100644 --- a/solr/core/src/test/org/apache/solr/servlet/DirectSolrConnectionTest.java +++ b/solr/core/src/test/org/apache/solr/servlet/DirectSolrConnectionTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.servlet; import java.net.URLEncoder; diff --git a/solr/core/src/test/org/apache/solr/servlet/ResponseHeaderTest.java b/solr/core/src/test/org/apache/solr/servlet/ResponseHeaderTest.java index 61392c35f29..f8511566a19 100644 --- a/solr/core/src/test/org/apache/solr/servlet/ResponseHeaderTest.java +++ b/solr/core/src/test/org/apache/solr/servlet/ResponseHeaderTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.servlet; - /* * 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.servlet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.servlet; import org.apache.commons.io.FileUtils; import org.apache.http.Header; diff --git a/solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.java b/solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.java index f22fe5dbafa..53ef7a6c298 100644 --- a/solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.java +++ b/solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.servlet; import static org.easymock.EasyMock.anyObject; diff --git a/solr/core/src/test/org/apache/solr/spelling/ConjunctionSolrSpellCheckerTest.java b/solr/core/src/test/org/apache/solr/spelling/ConjunctionSolrSpellCheckerTest.java index 0ddbab2dcc7..2a7daa99e1b 100644 --- a/solr/core/src/test/org/apache/solr/spelling/ConjunctionSolrSpellCheckerTest.java +++ b/solr/core/src/test/org/apache/solr/spelling/ConjunctionSolrSpellCheckerTest.java @@ -1,15 +1,3 @@ -package org.apache.solr.spelling; - -import java.io.IOException; - -import org.apache.lucene.search.spell.LevensteinDistance; -import org.apache.lucene.search.spell.NGramDistance; -import org.apache.lucene.search.spell.StringDistance; -import org.apache.lucene.util.LuceneTestCase; -import org.apache.solr.core.SolrCore; -import org.apache.solr.search.SolrIndexSearcher; -import org.junit.Test; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -26,6 +14,17 @@ import org.junit.Test; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.spelling; + +import java.io.IOException; + +import org.apache.lucene.search.spell.LevensteinDistance; +import org.apache.lucene.search.spell.NGramDistance; +import org.apache.lucene.search.spell.StringDistance; +import org.apache.lucene.util.LuceneTestCase; +import org.apache.solr.core.SolrCore; +import org.apache.solr.search.SolrIndexSearcher; +import org.junit.Test; public class ConjunctionSolrSpellCheckerTest extends LuceneTestCase { diff --git a/solr/core/src/test/org/apache/solr/spelling/DirectSolrSpellCheckerTest.java b/solr/core/src/test/org/apache/solr/spelling/DirectSolrSpellCheckerTest.java index 3ce1c9d47a3..1cde8d2604f 100644 --- a/solr/core/src/test/org/apache/solr/spelling/DirectSolrSpellCheckerTest.java +++ b/solr/core/src/test/org/apache/solr/spelling/DirectSolrSpellCheckerTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.spelling; - /* * 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.spelling; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.spelling; import java.util.Collection; import java.util.Map; diff --git a/solr/core/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java b/solr/core/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java index 9f56223e953..3182a28752a 100644 --- a/solr/core/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java +++ b/solr/core/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.spelling; import java.io.File; diff --git a/solr/core/src/test/org/apache/solr/spelling/SampleComparator.java b/solr/core/src/test/org/apache/solr/spelling/SampleComparator.java index a4bb055f357..095edbb139a 100644 --- a/solr/core/src/test/org/apache/solr/spelling/SampleComparator.java +++ b/solr/core/src/test/org/apache/solr/spelling/SampleComparator.java @@ -1,4 +1,3 @@ -package org.apache.solr.spelling; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.spelling; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.spelling; import org.apache.lucene.search.spell.SuggestWord; import java.util.Comparator; diff --git a/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java b/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java index a60578554f2..97111498928 100644 --- a/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java +++ b/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java @@ -1,4 +1,3 @@ -package org.apache.solr.spelling; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.spelling; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.spelling; import java.util.HashSet; import java.util.List; import java.util.Set; diff --git a/solr/core/src/test/org/apache/solr/spelling/SpellPossibilityIteratorTest.java b/solr/core/src/test/org/apache/solr/spelling/SpellPossibilityIteratorTest.java index 9c621512767..1e69b732ab9 100644 --- a/solr/core/src/test/org/apache/solr/spelling/SpellPossibilityIteratorTest.java +++ b/solr/core/src/test/org/apache/solr/spelling/SpellPossibilityIteratorTest.java @@ -1,4 +1,3 @@ -package org.apache.solr.spelling; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.spelling; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.spelling; import java.util.HashSet; import java.util.LinkedHashMap; import java.util.Map; diff --git a/solr/core/src/test/org/apache/solr/spelling/SpellingQueryConverterTest.java b/solr/core/src/test/org/apache/solr/spelling/SpellingQueryConverterTest.java index 55885b35eec..ed0749f8b16 100644 --- a/solr/core/src/test/org/apache/solr/spelling/SpellingQueryConverterTest.java +++ b/solr/core/src/test/org/apache/solr/spelling/SpellingQueryConverterTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.spelling; import org.apache.lucene.analysis.Token; diff --git a/solr/core/src/test/org/apache/solr/spelling/TestSuggestSpellingConverter.java b/solr/core/src/test/org/apache/solr/spelling/TestSuggestSpellingConverter.java index 2fb2423f859..1d312e07bca 100644 --- a/solr/core/src/test/org/apache/solr/spelling/TestSuggestSpellingConverter.java +++ b/solr/core/src/test/org/apache/solr/spelling/TestSuggestSpellingConverter.java @@ -1,5 +1,3 @@ -package org.apache.solr.spelling; - /* * 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.spelling; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.spelling; import java.io.IOException; import java.io.Reader; diff --git a/solr/core/src/test/org/apache/solr/spelling/WordBreakSolrSpellCheckerTest.java b/solr/core/src/test/org/apache/solr/spelling/WordBreakSolrSpellCheckerTest.java index eeb3185649f..92e06bb2403 100644 --- a/solr/core/src/test/org/apache/solr/spelling/WordBreakSolrSpellCheckerTest.java +++ b/solr/core/src/test/org/apache/solr/spelling/WordBreakSolrSpellCheckerTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.spelling; - /* * 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.spelling; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.spelling; import java.util.Collection; import java.util.LinkedHashMap; diff --git a/solr/core/src/test/org/apache/solr/spelling/suggest/SuggesterFSTTest.java b/solr/core/src/test/org/apache/solr/spelling/suggest/SuggesterFSTTest.java index e5d92ea5d54..8254a2447f1 100644 --- a/solr/core/src/test/org/apache/solr/spelling/suggest/SuggesterFSTTest.java +++ b/solr/core/src/test/org/apache/solr/spelling/suggest/SuggesterFSTTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.spelling.suggest; - /* * 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.spelling.suggest; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.spelling.suggest; public class SuggesterFSTTest extends SuggesterTest { public SuggesterFSTTest() { diff --git a/solr/core/src/test/org/apache/solr/spelling/suggest/SuggesterTSTTest.java b/solr/core/src/test/org/apache/solr/spelling/suggest/SuggesterTSTTest.java index c85a3b99705..49083569f95 100644 --- a/solr/core/src/test/org/apache/solr/spelling/suggest/SuggesterTSTTest.java +++ b/solr/core/src/test/org/apache/solr/spelling/suggest/SuggesterTSTTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.spelling.suggest; - /* * 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.spelling.suggest; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.spelling.suggest; public class SuggesterTSTTest extends SuggesterTest { public SuggesterTSTTest() { diff --git a/solr/core/src/test/org/apache/solr/spelling/suggest/SuggesterTest.java b/solr/core/src/test/org/apache/solr/spelling/suggest/SuggesterTest.java index 0edb5e6ce7b..a9eefdc9870 100644 --- a/solr/core/src/test/org/apache/solr/spelling/suggest/SuggesterTest.java +++ b/solr/core/src/test/org/apache/solr/spelling/suggest/SuggesterTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.spelling.suggest; import java.io.File; diff --git a/solr/core/src/test/org/apache/solr/spelling/suggest/SuggesterWFSTTest.java b/solr/core/src/test/org/apache/solr/spelling/suggest/SuggesterWFSTTest.java index 8b36f67fe92..ceae5f46535 100644 --- a/solr/core/src/test/org/apache/solr/spelling/suggest/SuggesterWFSTTest.java +++ b/solr/core/src/test/org/apache/solr/spelling/suggest/SuggesterWFSTTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.spelling.suggest; - /* * 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.spelling.suggest; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.spelling.suggest; public class SuggesterWFSTTest extends SuggesterTest { public SuggesterWFSTTest() { diff --git a/solr/core/src/test/org/apache/solr/spelling/suggest/TestAnalyzeInfixSuggestions.java b/solr/core/src/test/org/apache/solr/spelling/suggest/TestAnalyzeInfixSuggestions.java index be5ce8f287d..ed8e812f721 100644 --- a/solr/core/src/test/org/apache/solr/spelling/suggest/TestAnalyzeInfixSuggestions.java +++ b/solr/core/src/test/org/apache/solr/spelling/suggest/TestAnalyzeInfixSuggestions.java @@ -1,9 +1,3 @@ -package org.apache.solr.spelling.suggest; - -import org.apache.solr.SolrTestCaseJ4; -import org.apache.solr.common.params.SpellingParams; -import org.junit.BeforeClass; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -20,6 +14,11 @@ import org.junit.BeforeClass; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.spelling.suggest; + +import org.apache.solr.SolrTestCaseJ4; +import org.apache.solr.common.params.SpellingParams; +import org.junit.BeforeClass; public class TestAnalyzeInfixSuggestions extends SolrTestCaseJ4 { static final String URI_DEFAULT = "/infix_suggest_analyzing"; diff --git a/solr/core/src/test/org/apache/solr/spelling/suggest/TestAnalyzedSuggestions.java b/solr/core/src/test/org/apache/solr/spelling/suggest/TestAnalyzedSuggestions.java index d95f13f3942..cb19af880bc 100644 --- a/solr/core/src/test/org/apache/solr/spelling/suggest/TestAnalyzedSuggestions.java +++ b/solr/core/src/test/org/apache/solr/spelling/suggest/TestAnalyzedSuggestions.java @@ -1,5 +1,3 @@ -package org.apache.solr.spelling.suggest; - /* * 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.spelling.suggest; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.spelling.suggest; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.common.params.SpellingParams; diff --git a/solr/core/src/test/org/apache/solr/spelling/suggest/TestBlendedInfixSuggestions.java b/solr/core/src/test/org/apache/solr/spelling/suggest/TestBlendedInfixSuggestions.java index c11d9db1c5c..4dc038ffacf 100644 --- a/solr/core/src/test/org/apache/solr/spelling/suggest/TestBlendedInfixSuggestions.java +++ b/solr/core/src/test/org/apache/solr/spelling/suggest/TestBlendedInfixSuggestions.java @@ -1,5 +1,3 @@ -package org.apache.solr.spelling.suggest; - /* * 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.spelling.suggest; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.spelling.suggest; import org.apache.solr.SolrTestCaseJ4; import org.junit.BeforeClass; diff --git a/solr/core/src/test/org/apache/solr/spelling/suggest/TestFileDictionaryLookup.java b/solr/core/src/test/org/apache/solr/spelling/suggest/TestFileDictionaryLookup.java index ed13899e6fa..387dec0f9b0 100644 --- a/solr/core/src/test/org/apache/solr/spelling/suggest/TestFileDictionaryLookup.java +++ b/solr/core/src/test/org/apache/solr/spelling/suggest/TestFileDictionaryLookup.java @@ -1,5 +1,3 @@ -package org.apache.solr.spelling.suggest; - /* * 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.spelling.suggest; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.spelling.suggest; import org.apache.solr.SolrTestCaseJ4; import org.junit.BeforeClass; diff --git a/solr/core/src/test/org/apache/solr/spelling/suggest/TestFreeTextSuggestions.java b/solr/core/src/test/org/apache/solr/spelling/suggest/TestFreeTextSuggestions.java index 34965e70c1e..bd5d37c5d95 100644 --- a/solr/core/src/test/org/apache/solr/spelling/suggest/TestFreeTextSuggestions.java +++ b/solr/core/src/test/org/apache/solr/spelling/suggest/TestFreeTextSuggestions.java @@ -1,5 +1,3 @@ -package org.apache.solr.spelling.suggest; - /* * 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.spelling.suggest; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.spelling.suggest; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.common.params.SpellingParams; diff --git a/solr/core/src/test/org/apache/solr/spelling/suggest/TestFuzzyAnalyzedSuggestions.java b/solr/core/src/test/org/apache/solr/spelling/suggest/TestFuzzyAnalyzedSuggestions.java index 439c14f7765..4d33e8bf0f6 100644 --- a/solr/core/src/test/org/apache/solr/spelling/suggest/TestFuzzyAnalyzedSuggestions.java +++ b/solr/core/src/test/org/apache/solr/spelling/suggest/TestFuzzyAnalyzedSuggestions.java @@ -1,9 +1,3 @@ -package org.apache.solr.spelling.suggest; - -import org.apache.solr.SolrTestCaseJ4; -import org.apache.solr.common.params.SpellingParams; -import org.junit.BeforeClass; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -20,6 +14,11 @@ import org.junit.BeforeClass; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.spelling.suggest; + +import org.apache.solr.SolrTestCaseJ4; +import org.apache.solr.common.params.SpellingParams; +import org.junit.BeforeClass; public class TestFuzzyAnalyzedSuggestions extends SolrTestCaseJ4 { static final String URI_DEFAULT = "/fuzzy_suggest_analyzing"; diff --git a/solr/core/src/test/org/apache/solr/spelling/suggest/TestHighFrequencyDictionaryFactory.java b/solr/core/src/test/org/apache/solr/spelling/suggest/TestHighFrequencyDictionaryFactory.java index 41cfb94cc30..84f9386e194 100644 --- a/solr/core/src/test/org/apache/solr/spelling/suggest/TestHighFrequencyDictionaryFactory.java +++ b/solr/core/src/test/org/apache/solr/spelling/suggest/TestHighFrequencyDictionaryFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.spelling.suggest; - /* * 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.spelling.suggest; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.spelling.suggest; import org.apache.solr.SolrTestCaseJ4; import org.junit.BeforeClass; diff --git a/solr/core/src/test/org/apache/solr/spelling/suggest/TestPhraseSuggestions.java b/solr/core/src/test/org/apache/solr/spelling/suggest/TestPhraseSuggestions.java index 28bba18da63..88cd3247ec3 100644 --- a/solr/core/src/test/org/apache/solr/spelling/suggest/TestPhraseSuggestions.java +++ b/solr/core/src/test/org/apache/solr/spelling/suggest/TestPhraseSuggestions.java @@ -1,5 +1,3 @@ -package org.apache.solr.spelling.suggest; - /* * 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.spelling.suggest; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.spelling.suggest; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.common.params.SpellingParams; diff --git a/solr/core/src/test/org/apache/solr/store/blockcache/BlockCacheTest.java b/solr/core/src/test/org/apache/solr/store/blockcache/BlockCacheTest.java index 90243376ae6..8e2edfe02b4 100644 --- a/solr/core/src/test/org/apache/solr/store/blockcache/BlockCacheTest.java +++ b/solr/core/src/test/org/apache/solr/store/blockcache/BlockCacheTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.store.blockcache; - /* * 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.store.blockcache; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.store.blockcache; import java.util.Arrays; import java.util.Random; diff --git a/solr/core/src/test/org/apache/solr/store/blockcache/BlockDirectoryTest.java b/solr/core/src/test/org/apache/solr/store/blockcache/BlockDirectoryTest.java index fb043f09f50..7f510cdd915 100644 --- a/solr/core/src/test/org/apache/solr/store/blockcache/BlockDirectoryTest.java +++ b/solr/core/src/test/org/apache/solr/store/blockcache/BlockDirectoryTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.store.blockcache; - /* * 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.store.blockcache; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.store.blockcache; import java.io.File; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/store/blockcache/BufferStoreTest.java b/solr/core/src/test/org/apache/solr/store/blockcache/BufferStoreTest.java index 67514143e06..e91d762f5d4 100644 --- a/solr/core/src/test/org/apache/solr/store/blockcache/BufferStoreTest.java +++ b/solr/core/src/test/org/apache/solr/store/blockcache/BufferStoreTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.store.blockcache; - /* * 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.store.blockcache; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.store.blockcache; import java.math.BigDecimal; diff --git a/solr/core/src/test/org/apache/solr/store/hdfs/HdfsDirectoryTest.java b/solr/core/src/test/org/apache/solr/store/hdfs/HdfsDirectoryTest.java index 153d3241348..29a181ba2df 100644 --- a/solr/core/src/test/org/apache/solr/store/hdfs/HdfsDirectoryTest.java +++ b/solr/core/src/test/org/apache/solr/store/hdfs/HdfsDirectoryTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.store.hdfs; - /* * 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.store.hdfs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.store.hdfs; import java.io.IOException; import java.util.HashSet; diff --git a/solr/core/src/test/org/apache/solr/store/hdfs/HdfsLockFactoryTest.java b/solr/core/src/test/org/apache/solr/store/hdfs/HdfsLockFactoryTest.java index 6e3a1b6f4ed..452c1f406cf 100644 --- a/solr/core/src/test/org/apache/solr/store/hdfs/HdfsLockFactoryTest.java +++ b/solr/core/src/test/org/apache/solr/store/hdfs/HdfsLockFactoryTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.store.hdfs; - /* * 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.store.hdfs; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.store.hdfs; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java b/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java index 2cc511310aa..3be8c2eba06 100644 --- a/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java +++ b/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java @@ -1,20 +1,19 @@ /* * 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 - * + * 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. + * 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; import java.io.ByteArrayInputStream; diff --git a/solr/core/src/test/org/apache/solr/update/AnalysisErrorHandlingTest.java b/solr/core/src/test/org/apache/solr/update/AnalysisErrorHandlingTest.java index 52b8ec5c011..2034fa0ad1c 100644 --- a/solr/core/src/test/org/apache/solr/update/AnalysisErrorHandlingTest.java +++ b/solr/core/src/test/org/apache/solr/update/AnalysisErrorHandlingTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.update; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.common.SolrException; diff --git a/solr/core/src/test/org/apache/solr/update/AutoCommitTest.java b/solr/core/src/test/org/apache/solr/update/AutoCommitTest.java index 73647ef620c..080a02fd087 100644 --- a/solr/core/src/test/org/apache/solr/update/AutoCommitTest.java +++ b/solr/core/src/test/org/apache/solr/update/AutoCommitTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/test/org/apache/solr/update/CdcrUpdateLogTest.java b/solr/core/src/test/org/apache/solr/update/CdcrUpdateLogTest.java index 2da006c3d40..8a958a5931f 100644 --- a/solr/core/src/test/org/apache/solr/update/CdcrUpdateLogTest.java +++ b/solr/core/src/test/org/apache/solr/update/CdcrUpdateLogTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.update; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update; import java.io.File; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/update/DataDrivenBlockJoinTest.java b/solr/core/src/test/org/apache/solr/update/DataDrivenBlockJoinTest.java index 7f21edc3c7e..5d643df8bd5 100644 --- a/solr/core/src/test/org/apache/solr/update/DataDrivenBlockJoinTest.java +++ b/solr/core/src/test/org/apache/solr/update/DataDrivenBlockJoinTest.java @@ -1,23 +1,21 @@ /* * 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 + * 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 + * 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. + * 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; - import java.io.File; import org.apache.commons.io.FileUtils; @@ -25,7 +23,6 @@ import org.apache.solr.SolrTestCaseJ4; import org.junit.Before; import org.junit.Test; - public class DataDrivenBlockJoinTest extends SolrTestCaseJ4 { private File tmpSolrHome; private File tmpConfDir; diff --git a/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java b/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java index 066eb351422..dc5ab44cd1d 100644 --- a/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java +++ b/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java @@ -1,4 +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 @@ -15,7 +14,7 @@ package org.apache.solr.update; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.update; import java.io.File; import java.io.FileFilter; diff --git a/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java b/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java index 569ad45bbaf..781d5472b22 100644 --- a/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update; import java.lang.invoke.MethodHandles; diff --git a/solr/core/src/test/org/apache/solr/update/DocumentBuilderTest.java b/solr/core/src/test/org/apache/solr/update/DocumentBuilderTest.java index 4d1978b9206..88727457017 100644 --- a/solr/core/src/test/org/apache/solr/update/DocumentBuilderTest.java +++ b/solr/core/src/test/org/apache/solr/update/DocumentBuilderTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update; import java.util.List; diff --git a/solr/core/src/test/org/apache/solr/update/DummyMergePolicy.java b/solr/core/src/test/org/apache/solr/update/DummyMergePolicy.java index 32713aa8dd7..ed1b3ff6b07 100644 --- a/solr/core/src/test/org/apache/solr/update/DummyMergePolicy.java +++ b/solr/core/src/test/org/apache/solr/update/DummyMergePolicy.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 @@ -16,6 +14,7 @@ package org.apache.solr.update; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.LogByteSizeMergePolicy; diff --git a/solr/core/src/test/org/apache/solr/update/HardAutoCommitTest.java b/solr/core/src/test/org/apache/solr/update/HardAutoCommitTest.java index 873f8cb0e62..eb2e8aac9d1 100644 --- a/solr/core/src/test/org/apache/solr/update/HardAutoCommitTest.java +++ b/solr/core/src/test/org/apache/solr/update/HardAutoCommitTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update; import java.util.HashMap; diff --git a/solr/core/src/test/org/apache/solr/update/MockStreamingSolrClients.java b/solr/core/src/test/org/apache/solr/update/MockStreamingSolrClients.java index 3c57f74e663..72d39ff89bb 100644 --- a/solr/core/src/test/org/apache/solr/update/MockStreamingSolrClients.java +++ b/solr/core/src/test/org/apache/solr/update/MockStreamingSolrClients.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 @@ -16,6 +14,7 @@ package org.apache.solr.update; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update; import org.apache.lucene.util.LuceneTestCase; import org.apache.solr.client.solrj.SolrClient; diff --git a/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java b/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java index afabcd91d26..8083ad066e1 100644 --- a/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java +++ b/solr/core/src/test/org/apache/solr/update/PeerSyncTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.update; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update; import org.apache.solr.BaseDistributedSearchTestCase; import org.apache.solr.SolrTestCaseJ4.SuppressSSL; diff --git a/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java b/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java index 9f1f788518a..0daf2414c89 100644 --- a/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java +++ b/solr/core/src/test/org/apache/solr/update/SoftAutoCommitTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update; import static java.util.concurrent.TimeUnit.MILLISECONDS; diff --git a/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java b/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java index 4df15992dec..422c3ff19e1 100644 --- a/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java +++ b/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.update; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update; import javax.xml.parsers.ParserConfigurationException; import java.io.File; diff --git a/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java b/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java index 114a3844f25..6a291dc81ec 100644 --- a/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.java +++ b/solr/core/src/test/org/apache/solr/update/SolrIndexConfigTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.update; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update; import java.nio.file.Path; import java.util.Map; diff --git a/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java b/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java index cb50ac80216..0bd2e6e0050 100644 --- a/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java +++ b/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.update; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update; import java.io.File; import java.io.UnsupportedEncodingException; diff --git a/solr/core/src/test/org/apache/solr/update/TestDocBasedVersionConstraints.java b/solr/core/src/test/org/apache/solr/update/TestDocBasedVersionConstraints.java index 779e12cc481..b9edc1dd67a 100644 --- a/solr/core/src/test/org/apache/solr/update/TestDocBasedVersionConstraints.java +++ b/solr/core/src/test/org/apache/solr/update/TestDocBasedVersionConstraints.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update; import org.apache.lucene.util.TestUtil; diff --git a/solr/core/src/test/org/apache/solr/update/TestExceedMaxTermLength.java b/solr/core/src/test/org/apache/solr/update/TestExceedMaxTermLength.java index d241f883a41..08881214f52 100644 --- a/solr/core/src/test/org/apache/solr/update/TestExceedMaxTermLength.java +++ b/solr/core/src/test/org/apache/solr/update/TestExceedMaxTermLength.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 @@ -16,6 +14,7 @@ package org.apache.solr.update; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.util.TestUtil; diff --git a/solr/core/src/test/org/apache/solr/update/TestHdfsUpdateLog.java b/solr/core/src/test/org/apache/solr/update/TestHdfsUpdateLog.java index 5021d843d5c..646ed51ca26 100644 --- a/solr/core/src/test/org/apache/solr/update/TestHdfsUpdateLog.java +++ b/solr/core/src/test/org/apache/solr/update/TestHdfsUpdateLog.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 @@ -16,6 +14,7 @@ package org.apache.solr.update; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update; import java.io.IOException; import java.net.URI; diff --git a/solr/core/src/test/org/apache/solr/update/TestIndexingPerformance.java b/solr/core/src/test/org/apache/solr/update/TestIndexingPerformance.java index 020dcc6f50a..6aee5bd57b1 100644 --- a/solr/core/src/test/org/apache/solr/update/TestIndexingPerformance.java +++ b/solr/core/src/test/org/apache/solr/update/TestIndexingPerformance.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update; import org.apache.solr.common.SolrInputDocument; diff --git a/solr/core/src/test/org/apache/solr/update/UpdateParamsTest.java b/solr/core/src/test/org/apache/solr/update/UpdateParamsTest.java index aafb6e56df2..b90a9400383 100644 --- a/solr/core/src/test/org/apache/solr/update/UpdateParamsTest.java +++ b/solr/core/src/test/org/apache/solr/update/UpdateParamsTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update; import java.util.HashMap; diff --git a/solr/core/src/test/org/apache/solr/update/VersionInfoTest.java b/solr/core/src/test/org/apache/solr/update/VersionInfoTest.java index 2c451dba1b8..b8039a81ef0 100644 --- a/solr/core/src/test/org/apache/solr/update/VersionInfoTest.java +++ b/solr/core/src/test/org/apache/solr/update/VersionInfoTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.update; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update; import org.apache.lucene.util.BytesRef; import org.apache.solr.SolrTestCaseJ4; diff --git a/solr/core/src/test/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactoryTest.java b/solr/core/src/test/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactoryTest.java index 1d640db4a9f..8b59d0e51c9 100644 --- a/solr/core/src/test/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactoryTest.java +++ b/solr/core/src/test/org/apache/solr/update/processor/AddSchemaFieldsUpdateProcessorFactoryTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import java.io.File; diff --git a/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java b/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java index cd9caccd2f3..09fa721eb59 100644 --- a/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java +++ b/solr/core/src/test/org/apache/solr/update/processor/AtomicUpdatesTest.java @@ -1,19 +1,3 @@ -package org.apache.solr.update.processor; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -import com.google.common.collect.ImmutableMap; -import org.apache.solr.SolrTestCaseJ4; -import org.apache.solr.common.SolrInputDocument; -import org.apache.solr.schema.TrieDateField; -import org.apache.solr.util.DateFormatUtil; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -30,6 +14,21 @@ import org.junit.Test; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update.processor; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import com.google.common.collect.ImmutableMap; +import org.apache.solr.SolrTestCaseJ4; +import org.apache.solr.common.SolrInputDocument; +import org.apache.solr.schema.TrieDateField; +import org.apache.solr.util.DateFormatUtil; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Ignore; +import org.junit.Test; public class AtomicUpdatesTest extends SolrTestCaseJ4 { diff --git a/solr/core/src/test/org/apache/solr/update/processor/CloneFieldUpdateProcessorFactoryTest.java b/solr/core/src/test/org/apache/solr/update/processor/CloneFieldUpdateProcessorFactoryTest.java index ac618416228..5f9005b0f90 100644 --- a/solr/core/src/test/org/apache/solr/update/processor/CloneFieldUpdateProcessorFactoryTest.java +++ b/solr/core/src/test/org/apache/solr/update/processor/CloneFieldUpdateProcessorFactoryTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import java.util.Arrays; diff --git a/solr/core/src/test/org/apache/solr/update/processor/CustomUpdateRequestProcessor.java b/solr/core/src/test/org/apache/solr/update/processor/CustomUpdateRequestProcessor.java index 41282f5870f..36bf56433aa 100644 --- a/solr/core/src/test/org/apache/solr/update/processor/CustomUpdateRequestProcessor.java +++ b/solr/core/src/test/org/apache/solr/update/processor/CustomUpdateRequestProcessor.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import org.apache.solr.common.util.NamedList; diff --git a/solr/core/src/test/org/apache/solr/update/processor/CustomUpdateRequestProcessorFactory.java b/solr/core/src/test/org/apache/solr/update/processor/CustomUpdateRequestProcessorFactory.java index e9fa3ad97b6..81be95c5858 100644 --- a/solr/core/src/test/org/apache/solr/update/processor/CustomUpdateRequestProcessorFactory.java +++ b/solr/core/src/test/org/apache/solr/update/processor/CustomUpdateRequestProcessorFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import org.apache.solr.common.util.NamedList; diff --git a/solr/core/src/test/org/apache/solr/update/processor/DefaultValueUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/update/processor/DefaultValueUpdateProcessorTest.java index 7099285618b..2f3c9c07985 100644 --- a/solr/core/src/test/org/apache/solr/update/processor/DefaultValueUpdateProcessorTest.java +++ b/solr/core/src/test/org/apache/solr/update/processor/DefaultValueUpdateProcessorTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import java.util.Date; diff --git a/solr/core/src/test/org/apache/solr/update/processor/DocExpirationUpdateProcessorFactoryTest.java b/solr/core/src/test/org/apache/solr/update/processor/DocExpirationUpdateProcessorFactoryTest.java index b4e8ca0bb79..e625f8f9eb7 100644 --- a/solr/core/src/test/org/apache/solr/update/processor/DocExpirationUpdateProcessorFactoryTest.java +++ b/solr/core/src/test/org/apache/solr/update/processor/DocExpirationUpdateProcessorFactoryTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import org.apache.solr.common.SolrInputDocument; diff --git a/solr/core/src/test/org/apache/solr/update/processor/FieldMutatingUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/update/processor/FieldMutatingUpdateProcessorTest.java index 1966c698324..ecfe77273fa 100644 --- a/solr/core/src/test/org/apache/solr/update/processor/FieldMutatingUpdateProcessorTest.java +++ b/solr/core/src/test/org/apache/solr/update/processor/FieldMutatingUpdateProcessorTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import java.util.LinkedHashSet; diff --git a/solr/core/src/test/org/apache/solr/update/processor/IgnoreCommitOptimizeUpdateProcessorFactoryTest.java b/solr/core/src/test/org/apache/solr/update/processor/IgnoreCommitOptimizeUpdateProcessorFactoryTest.java index 0c6b1c1cef2..24a697669eb 100644 --- a/solr/core/src/test/org/apache/solr/update/processor/IgnoreCommitOptimizeUpdateProcessorFactoryTest.java +++ b/solr/core/src/test/org/apache/solr/update/processor/IgnoreCommitOptimizeUpdateProcessorFactoryTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.update.processor; - /* * 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.update.processor; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update.processor; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.common.SolrInputDocument; diff --git a/solr/core/src/test/org/apache/solr/update/processor/ParsingFieldUpdateProcessorsTest.java b/solr/core/src/test/org/apache/solr/update/processor/ParsingFieldUpdateProcessorsTest.java index 691e8ff620c..b779f7a12d9 100644 --- a/solr/core/src/test/org/apache/solr/update/processor/ParsingFieldUpdateProcessorsTest.java +++ b/solr/core/src/test/org/apache/solr/update/processor/ParsingFieldUpdateProcessorsTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import org.apache.solr.common.SolrInputDocument; diff --git a/solr/core/src/test/org/apache/solr/update/processor/PreAnalyzedUpdateProcessorTest.java b/solr/core/src/test/org/apache/solr/update/processor/PreAnalyzedUpdateProcessorTest.java index 8d3e7a2bc12..20ce997f38f 100644 --- a/solr/core/src/test/org/apache/solr/update/processor/PreAnalyzedUpdateProcessorTest.java +++ b/solr/core/src/test/org/apache/solr/update/processor/PreAnalyzedUpdateProcessorTest.java @@ -1,10 +1,3 @@ -package org.apache.solr.update.processor; - -import org.apache.lucene.document.Field; -import org.apache.solr.common.SolrInputDocument; -import org.junit.BeforeClass; -import org.junit.Test; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -21,6 +14,12 @@ import org.junit.Test; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update.processor; + +import org.apache.lucene.document.Field; +import org.apache.solr.common.SolrInputDocument; +import org.junit.BeforeClass; +import org.junit.Test; public class PreAnalyzedUpdateProcessorTest extends UpdateProcessorTestBase { String[] simpleTitle = new String[] { diff --git a/solr/core/src/test/org/apache/solr/update/processor/RecordingUpdateProcessorFactory.java b/solr/core/src/test/org/apache/solr/update/processor/RecordingUpdateProcessorFactory.java index add57ef3257..ea44046ac93 100644 --- a/solr/core/src/test/org/apache/solr/update/processor/RecordingUpdateProcessorFactory.java +++ b/solr/core/src/test/org/apache/solr/update/processor/RecordingUpdateProcessorFactory.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/update/processor/RuntimeUrp.java b/solr/core/src/test/org/apache/solr/update/processor/RuntimeUrp.java index a80f0975dbb..7c71a15c6ce 100644 --- a/solr/core/src/test/org/apache/solr/update/processor/RuntimeUrp.java +++ b/solr/core/src/test/org/apache/solr/update/processor/RuntimeUrp.java @@ -1,5 +1,3 @@ -package org.apache.solr.update.processor; - /* * 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.update.processor; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update.processor; import java.util.ArrayList; import java.util.List; diff --git a/solr/core/src/test/org/apache/solr/update/processor/ScriptEngineTest.java b/solr/core/src/test/org/apache/solr/update/processor/ScriptEngineTest.java index 4fb644cb5c3..538d7cf4009 100644 --- a/solr/core/src/test/org/apache/solr/update/processor/ScriptEngineTest.java +++ b/solr/core/src/test/org/apache/solr/update/processor/ScriptEngineTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import org.apache.lucene.util.Constants; diff --git a/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java b/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java index e941412a8ee..da42071bb9c 100644 --- a/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java +++ b/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import org.apache.lucene.util.Constants; diff --git a/solr/core/src/test/org/apache/solr/update/processor/StatelessScriptUpdateProcessorFactoryTest.java b/solr/core/src/test/org/apache/solr/update/processor/StatelessScriptUpdateProcessorFactoryTest.java index c785cc6816f..b55d73aa5a7 100644 --- a/solr/core/src/test/org/apache/solr/update/processor/StatelessScriptUpdateProcessorFactoryTest.java +++ b/solr/core/src/test/org/apache/solr/update/processor/StatelessScriptUpdateProcessorFactoryTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.update.processor; - /* * 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.update.processor; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update.processor; import org.apache.solr.common.params.SolrParams; import org.apache.solr.common.params.ModifiableSolrParams; diff --git a/solr/core/src/test/org/apache/solr/update/processor/TestNamedUpdateProcessors.java b/solr/core/src/test/org/apache/solr/update/processor/TestNamedUpdateProcessors.java index 81474ad6436..85f21905716 100644 --- a/solr/core/src/test/org/apache/solr/update/processor/TestNamedUpdateProcessors.java +++ b/solr/core/src/test/org/apache/solr/update/processor/TestNamedUpdateProcessors.java @@ -1,5 +1,3 @@ -package org.apache.solr.update.processor; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,7 +14,7 @@ package org.apache.solr.update.processor; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.update.processor; import java.io.FileInputStream; import java.io.FileOutputStream; diff --git a/solr/core/src/test/org/apache/solr/update/processor/TestPartialUpdateDeduplication.java b/solr/core/src/test/org/apache/solr/update/processor/TestPartialUpdateDeduplication.java index 72898694acb..f7e71c64dd2 100644 --- a/solr/core/src/test/org/apache/solr/update/processor/TestPartialUpdateDeduplication.java +++ b/solr/core/src/test/org/apache/solr/update/processor/TestPartialUpdateDeduplication.java @@ -1,5 +1,3 @@ -package org.apache.solr.update.processor; - /* * 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.update.processor; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update.processor; import com.google.common.collect.Maps; import org.noggit.ObjectBuilder; diff --git a/solr/core/src/test/org/apache/solr/update/processor/UUIDUpdateProcessorFallbackTest.java b/solr/core/src/test/org/apache/solr/update/processor/UUIDUpdateProcessorFallbackTest.java index a11f9f43b78..bca2d30e225 100644 --- a/solr/core/src/test/org/apache/solr/update/processor/UUIDUpdateProcessorFallbackTest.java +++ b/solr/core/src/test/org/apache/solr/update/processor/UUIDUpdateProcessorFallbackTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.update.processor; - /* * 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.update.processor; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update.processor; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.common.SolrInputDocument; diff --git a/solr/core/src/test/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactoryTest.java b/solr/core/src/test/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactoryTest.java index b2e5ff0df11..4d684db3443 100644 --- a/solr/core/src/test/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactoryTest.java +++ b/solr/core/src/test/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactoryTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import java.util.ArrayList; diff --git a/solr/core/src/test/org/apache/solr/update/processor/UpdateProcessorTestBase.java b/solr/core/src/test/org/apache/solr/update/processor/UpdateProcessorTestBase.java index 09fab87b8e5..eb9f2127479 100644 --- a/solr/core/src/test/org/apache/solr/update/processor/UpdateProcessorTestBase.java +++ b/solr/core/src/test/org/apache/solr/update/processor/UpdateProcessorTestBase.java @@ -1,5 +1,3 @@ -package org.apache.solr.update.processor; - /* * 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.update.processor; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.update.processor; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.common.params.SolrParams; diff --git a/solr/core/src/test/org/apache/solr/update/processor/UpdateRequestProcessorFactoryTest.java b/solr/core/src/test/org/apache/solr/update/processor/UpdateRequestProcessorFactoryTest.java index 53ad6638968..e5d060e2c36 100644 --- a/solr/core/src/test/org/apache/solr/update/processor/UpdateRequestProcessorFactoryTest.java +++ b/solr/core/src/test/org/apache/solr/update/processor/UpdateRequestProcessorFactoryTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import static org.apache.solr.update.processor.DistributingUpdateProcessorFactory.DISTRIB_UPDATE_PARAM; diff --git a/solr/core/src/test/org/apache/solr/util/BitSetPerf.java b/solr/core/src/test/org/apache/solr/util/BitSetPerf.java index 76d1735a2ee..60a73863256 100644 --- a/solr/core/src/test/org/apache/solr/util/BitSetPerf.java +++ b/solr/core/src/test/org/apache/solr/util/BitSetPerf.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.util; import java.util.BitSet; diff --git a/solr/core/src/test/org/apache/solr/util/CircularListTest.java b/solr/core/src/test/org/apache/solr/util/CircularListTest.java index 526742814d2..9231bde889f 100644 --- a/solr/core/src/test/org/apache/solr/util/CircularListTest.java +++ b/solr/core/src/test/org/apache/solr/util/CircularListTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.util; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/util/DOMUtilTest.java b/solr/core/src/test/org/apache/solr/util/DOMUtilTest.java index b80f622aa37..1d97fe8dbcb 100644 --- a/solr/core/src/test/org/apache/solr/util/DOMUtilTest.java +++ b/solr/core/src/test/org/apache/solr/util/DOMUtilTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.util; - /* * 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.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; import org.apache.solr.common.util.NamedList; import org.apache.solr.common.util.SimpleOrderedMap; diff --git a/solr/core/src/test/org/apache/solr/util/DateMathParserTest.java b/solr/core/src/test/org/apache/solr/util/DateMathParserTest.java index b8cdc220191..c3623e8919e 100644 --- a/solr/core/src/test/org/apache/solr/util/DateMathParserTest.java +++ b/solr/core/src/test/org/apache/solr/util/DateMathParserTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.util; import static org.apache.solr.util.DateFormatUtil.UTC; diff --git a/solr/core/src/test/org/apache/solr/util/DistanceUnitsTest.java b/solr/core/src/test/org/apache/solr/util/DistanceUnitsTest.java index 6b2b5a4d9bc..f16292cc3c5 100644 --- a/solr/core/src/test/org/apache/solr/util/DistanceUnitsTest.java +++ b/solr/core/src/test/org/apache/solr/util/DistanceUnitsTest.java @@ -1,8 +1,3 @@ -package org.apache.solr.util; - -import com.spatial4j.core.distance.DistanceUtils; -import org.apache.lucene.util.LuceneTestCase; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -19,6 +14,10 @@ import org.apache.lucene.util.LuceneTestCase; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; + +import com.spatial4j.core.distance.DistanceUtils; +import org.apache.lucene.util.LuceneTestCase; public class DistanceUnitsTest extends LuceneTestCase { diff --git a/solr/core/src/test/org/apache/solr/util/FileUtilsTest.java b/solr/core/src/test/org/apache/solr/util/FileUtilsTest.java index ecf29a71bae..ab0462ad3ed 100644 --- a/solr/core/src/test/org/apache/solr/util/FileUtilsTest.java +++ b/solr/core/src/test/org/apache/solr/util/FileUtilsTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.util; - /* * 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.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; import java.io.File; import java.io.IOException; diff --git a/solr/core/src/test/org/apache/solr/util/MockCoreContainer.java b/solr/core/src/test/org/apache/solr/util/MockCoreContainer.java index 314cdc47804..054415a935b 100644 --- a/solr/core/src/test/org/apache/solr/util/MockCoreContainer.java +++ b/solr/core/src/test/org/apache/solr/util/MockCoreContainer.java @@ -1,5 +1,3 @@ -package org.apache.solr.util; - /* * 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.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; import java.nio.file.Path; import java.nio.file.Paths; diff --git a/solr/core/src/test/org/apache/solr/util/PrimUtilsTest.java b/solr/core/src/test/org/apache/solr/util/PrimUtilsTest.java index a2ad86d43e8..b9121c351c6 100644 --- a/solr/core/src/test/org/apache/solr/util/PrimUtilsTest.java +++ b/solr/core/src/test/org/apache/solr/util/PrimUtilsTest.java @@ -1,11 +1,10 @@ -package org.apache.solr.util; - /* - * Copyright 2004 The Apache Software Foundation - * - * Licensed 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 + * 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 * @@ -15,6 +14,7 @@ package org.apache.solr.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; import org.apache.lucene.util.LuceneTestCase; diff --git a/solr/core/src/test/org/apache/solr/util/SimplePostToolTest.java b/solr/core/src/test/org/apache/solr/util/SimplePostToolTest.java index 29576ad549a..7f70024b9b6 100644 --- a/solr/core/src/test/org/apache/solr/util/SimplePostToolTest.java +++ b/solr/core/src/test/org/apache/solr/util/SimplePostToolTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.util; - /* * 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.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.util.SimplePostTool.PageFetcher; diff --git a/solr/core/src/test/org/apache/solr/util/SolrPluginUtilsTest.java b/solr/core/src/test/org/apache/solr/util/SolrPluginUtilsTest.java index 70e9753155f..33e9291c703 100644 --- a/solr/core/src/test/org/apache/solr/util/SolrPluginUtilsTest.java +++ b/solr/core/src/test/org/apache/solr/util/SolrPluginUtilsTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.util; import org.apache.solr.SolrTestCaseJ4; diff --git a/solr/core/src/test/org/apache/solr/util/TestFastOutputStream.java b/solr/core/src/test/org/apache/solr/util/TestFastOutputStream.java index eb8ec60b2d7..9f4799938fc 100644 --- a/solr/core/src/test/org/apache/solr/util/TestFastOutputStream.java +++ b/solr/core/src/test/org/apache/solr/util/TestFastOutputStream.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.util; import org.apache.lucene.util.LuceneTestCase; diff --git a/solr/core/src/test/org/apache/solr/util/TestFastWriter.java b/solr/core/src/test/org/apache/solr/util/TestFastWriter.java index b503cbc9a09..81c8618bac3 100644 --- a/solr/core/src/test/org/apache/solr/util/TestFastWriter.java +++ b/solr/core/src/test/org/apache/solr/util/TestFastWriter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.util; import org.apache.lucene.util.LuceneTestCase; diff --git a/solr/core/src/test/org/apache/solr/util/TestObjectReleaseTracker.java b/solr/core/src/test/org/apache/solr/util/TestObjectReleaseTracker.java index db67c78ceac..da50fd8ebe0 100644 --- a/solr/core/src/test/org/apache/solr/util/TestObjectReleaseTracker.java +++ b/solr/core/src/test/org/apache/solr/util/TestObjectReleaseTracker.java @@ -1,5 +1,3 @@ -package org.apache.solr.util; - /* * 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.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.TestRuleLimitSysouts.Limit; diff --git a/solr/core/src/test/org/apache/solr/util/TestRTimerTree.java b/solr/core/src/test/org/apache/solr/util/TestRTimerTree.java index 31c13853f86..e046ab3ae20 100644 --- a/solr/core/src/test/org/apache/solr/util/TestRTimerTree.java +++ b/solr/core/src/test/org/apache/solr/util/TestRTimerTree.java @@ -1,5 +1,3 @@ -package org.apache.solr.util; - /* * 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.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; import org.apache.lucene.util.LuceneTestCase; import org.apache.solr.common.util.NamedList; diff --git a/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java b/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java index 702b430f6a4..e8066927084 100644 --- a/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java +++ b/solr/core/src/test/org/apache/solr/util/TestSolrCLIRunExample.java @@ -1,5 +1,3 @@ -package org.apache.solr.util; - /* * 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.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/solr/core/src/test/org/apache/solr/util/TestSystemIdResolver.java b/solr/core/src/test/org/apache/solr/util/TestSystemIdResolver.java index dd0a213998f..7980a592483 100644 --- a/solr/core/src/test/org/apache/solr/util/TestSystemIdResolver.java +++ b/solr/core/src/test/org/apache/solr/util/TestSystemIdResolver.java @@ -1,5 +1,3 @@ -package org.apache.solr.util; - /* * 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.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; import java.io.File; import java.nio.file.Path; diff --git a/solr/core/src/test/org/apache/solr/util/TestTestInjection.java b/solr/core/src/test/org/apache/solr/util/TestTestInjection.java index 2365ea9821e..a2893969130 100644 --- a/solr/core/src/test/org/apache/solr/util/TestTestInjection.java +++ b/solr/core/src/test/org/apache/solr/util/TestTestInjection.java @@ -1,5 +1,3 @@ -package org.apache.solr.util; - /* * 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.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; import java.util.Locale; diff --git a/solr/core/src/test/org/apache/solr/util/TestUtils.java b/solr/core/src/test/org/apache/solr/util/TestUtils.java index 2c3ba4ddc47..7b209ead3af 100644 --- a/solr/core/src/test/org/apache/solr/util/TestUtils.java +++ b/solr/core/src/test/org/apache/solr/util/TestUtils.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.util; import java.util.Arrays; diff --git a/solr/core/src/test/org/apache/solr/util/TimeZoneUtilsTest.java b/solr/core/src/test/org/apache/solr/util/TimeZoneUtilsTest.java index 727accb6e87..9ccbac263f4 100644 --- a/solr/core/src/test/org/apache/solr/util/TimeZoneUtilsTest.java +++ b/solr/core/src/test/org/apache/solr/util/TimeZoneUtilsTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.util; import org.apache.lucene.util.LuceneTestCase; diff --git a/solr/core/src/test/org/apache/solr/util/hll/BigEndianAscendingWordDeserializerTest.java b/solr/core/src/test/org/apache/solr/util/hll/BigEndianAscendingWordDeserializerTest.java index dab29371787..4e294288680 100644 --- a/solr/core/src/test/org/apache/solr/util/hll/BigEndianAscendingWordDeserializerTest.java +++ b/solr/core/src/test/org/apache/solr/util/hll/BigEndianAscendingWordDeserializerTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.util.hll; import java.util.Random; diff --git a/solr/core/src/test/org/apache/solr/util/hll/BigEndianAscendingWordSerializerTest.java b/solr/core/src/test/org/apache/solr/util/hll/BigEndianAscendingWordSerializerTest.java index 5cbaa0dd02b..05c104980cf 100644 --- a/solr/core/src/test/org/apache/solr/util/hll/BigEndianAscendingWordSerializerTest.java +++ b/solr/core/src/test/org/apache/solr/util/hll/BigEndianAscendingWordSerializerTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.util.hll; import java.util.Arrays; diff --git a/solr/core/src/test/org/apache/solr/util/hll/BitVectorTest.java b/solr/core/src/test/org/apache/solr/util/hll/BitVectorTest.java index bf6420bd670..c21e5ca5607 100644 --- a/solr/core/src/test/org/apache/solr/util/hll/BitVectorTest.java +++ b/solr/core/src/test/org/apache/solr/util/hll/BitVectorTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.util.hll; import java.util.Locale; diff --git a/solr/core/src/test/org/apache/solr/util/hll/ExplicitHLLTest.java b/solr/core/src/test/org/apache/solr/util/hll/ExplicitHLLTest.java index bf30d2f7cb7..7e98771a474 100644 --- a/solr/core/src/test/org/apache/solr/util/hll/ExplicitHLLTest.java +++ b/solr/core/src/test/org/apache/solr/util/hll/ExplicitHLLTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.util.hll; import java.util.HashSet; diff --git a/solr/core/src/test/org/apache/solr/util/hll/FullHLLTest.java b/solr/core/src/test/org/apache/solr/util/hll/FullHLLTest.java index dd5f21f802e..95cc6eb3ee8 100644 --- a/solr/core/src/test/org/apache/solr/util/hll/FullHLLTest.java +++ b/solr/core/src/test/org/apache/solr/util/hll/FullHLLTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.util.hll; import org.apache.lucene.util.LuceneTestCase; diff --git a/solr/core/src/test/org/apache/solr/util/hll/HLLSerializationTest.java b/solr/core/src/test/org/apache/solr/util/hll/HLLSerializationTest.java index 0ae4181e5b7..32b1dac924c 100644 --- a/solr/core/src/test/org/apache/solr/util/hll/HLLSerializationTest.java +++ b/solr/core/src/test/org/apache/solr/util/hll/HLLSerializationTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.util.hll; import org.apache.lucene.util.LuceneTestCase; diff --git a/solr/core/src/test/org/apache/solr/util/hll/HLLUtilTest.java b/solr/core/src/test/org/apache/solr/util/hll/HLLUtilTest.java index 583384d7014..c9301b3454c 100644 --- a/solr/core/src/test/org/apache/solr/util/hll/HLLUtilTest.java +++ b/solr/core/src/test/org/apache/solr/util/hll/HLLUtilTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.util.hll; import org.apache.lucene.util.LuceneTestCase; diff --git a/solr/core/src/test/org/apache/solr/util/hll/IntegrationTestGenerator.java b/solr/core/src/test/org/apache/solr/util/hll/IntegrationTestGenerator.java index edc2c9c4613..69757ce9312 100644 --- a/solr/core/src/test/org/apache/solr/util/hll/IntegrationTestGenerator.java +++ b/solr/core/src/test/org/apache/solr/util/hll/IntegrationTestGenerator.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.util.hll; import static com.carrotsearch.randomizedtesting.RandomizedTest.*; diff --git a/solr/core/src/test/org/apache/solr/util/hll/ProbabilisticTestUtil.java b/solr/core/src/test/org/apache/solr/util/hll/ProbabilisticTestUtil.java index 9bf74657d35..edfe5986063 100644 --- a/solr/core/src/test/org/apache/solr/util/hll/ProbabilisticTestUtil.java +++ b/solr/core/src/test/org/apache/solr/util/hll/ProbabilisticTestUtil.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.util.hll; /** diff --git a/solr/core/src/test/org/apache/solr/util/hll/SparseHLLTest.java b/solr/core/src/test/org/apache/solr/util/hll/SparseHLLTest.java index e7e02cb3fd3..d99bda1aab2 100644 --- a/solr/core/src/test/org/apache/solr/util/hll/SparseHLLTest.java +++ b/solr/core/src/test/org/apache/solr/util/hll/SparseHLLTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.util.hll; import org.apache.lucene.util.LuceneTestCase; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/ResponseParser.java b/solr/solrj/src/java/org/apache/solr/client/solrj/ResponseParser.java index d5c3b381fba..c08d1658124 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/ResponseParser.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/ResponseParser.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj; import java.io.Reader; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/SolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/SolrClient.java index e6e2eb4eb57..4b555e166d4 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/SolrClient.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/SolrClient.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj; import org.apache.solr.client.solrj.SolrRequest.METHOD; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/SolrQuery.java b/solr/solrj/src/java/org/apache/solr/client/solrj/SolrQuery.java index 2a859387dcc..d41673dbb58 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/SolrQuery.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/SolrQuery.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj; import org.apache.solr.common.params.CommonParams; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/SolrRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/SolrRequest.java index bcaae2bb5d1..3e31edf447c 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/SolrRequest.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/SolrRequest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj; import org.apache.solr.common.params.SolrParams; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/SolrResponse.java b/solr/solrj/src/java/org/apache/solr/client/solrj/SolrResponse.java index 244a7573c42..9987b96dca0 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/SolrResponse.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/SolrResponse.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj; import org.apache.solr.common.SolrException; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/SolrServerException.java b/solr/solrj/src/java/org/apache/solr/client/solrj/SolrServerException.java index ed16a435244..2616a5bd49c 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/SolrServerException.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/SolrServerException.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj; /** Exception to catch all types of communication / parsing issues associated with talking to SOLR diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/StreamingResponseCallback.java b/solr/solrj/src/java/org/apache/solr/client/solrj/StreamingResponseCallback.java index 2ba79c882f5..1137709d4eb 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/StreamingResponseCallback.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/StreamingResponseCallback.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj; import org.apache.solr.common.SolrDocument; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/beans/BindingException.java b/solr/solrj/src/java/org/apache/solr/client/solrj/beans/BindingException.java index cd10138bf5c..6cc6bad7482 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/beans/BindingException.java +++ b/solr/solrj/src/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 @@ -16,6 +14,7 @@ package org.apache.solr.client.solrj.beans; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.beans; public class BindingException extends RuntimeException { diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/beans/package-info.java b/solr/solrj/src/java/org/apache/solr/client/solrj/beans/package-info.java index 890005f82df..be93515dca0 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/beans/package-info.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/beans/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Annotation based mapping of client objects to Solr documents. */ diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java index 639807ceb44..0973475e71c 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java +++ b/solr/solrj/src/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 @@ -16,6 +14,7 @@ package org.apache.solr.client.solrj.impl; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.impl; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java index ac27e97543d..2762a9a4ea4 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClient.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.impl; import org.apache.http.HttpResponse; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientConfigurer.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientConfigurer.java index 67eeadff938..0f97bd0f894 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientConfigurer.java +++ b/solr/solrj/src/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 @@ -16,7 +14,7 @@ package org.apache.solr.client.solrj.impl; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.client.solrj.impl; import org.apache.http.HttpRequest; import org.apache.http.HttpRequestInterceptor; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/InputStreamResponseParser.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/InputStreamResponseParser.java index 2f181525b32..717b148d1bd 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/InputStreamResponseParser.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/InputStreamResponseParser.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 @@ -16,6 +14,7 @@ package org.apache.solr.client.solrj.impl; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.impl; import java.io.IOException; import java.io.InputStream; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Krb5HttpClientConfigurer.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Krb5HttpClientConfigurer.java index 9bfbc6c17c3..8b2705bdc5f 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Krb5HttpClientConfigurer.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/Krb5HttpClientConfigurer.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 @@ -16,6 +14,7 @@ package org.apache.solr.client.solrj.impl; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.impl; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/NoOpResponseParser.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/NoOpResponseParser.java index 267dd258b4c..dba26e3a089 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/NoOpResponseParser.java +++ b/solr/solrj/src/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 @@ -16,6 +14,7 @@ package org.apache.solr.client.solrj.impl; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.impl; import org.apache.commons.io.IOUtils; import org.apache.solr.client.solrj.ResponseParser; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrHttpRequestRetryHandler.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrHttpRequestRetryHandler.java index 1e43c045a41..f5b1b2a2ad2 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrHttpRequestRetryHandler.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrHttpRequestRetryHandler.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 @@ -16,6 +14,7 @@ package org.apache.solr.client.solrj.impl; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.impl; import java.io.IOException; import java.io.InterruptedIOException; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrPortAwareCookieSpecFactory.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrPortAwareCookieSpecFactory.java index 63c44054154..174df14731f 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrPortAwareCookieSpecFactory.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrPortAwareCookieSpecFactory.java @@ -1,20 +1,3 @@ -package org.apache.solr.client.solrj.impl; - -import java.util.Collection; - -import org.apache.http.cookie.ClientCookie; -import org.apache.http.cookie.Cookie; -import org.apache.http.cookie.CookieOrigin; -import org.apache.http.cookie.CookieSpec; -import org.apache.http.cookie.CookieSpecFactory; -import org.apache.http.cookie.CookieSpecProvider; -import org.apache.http.cookie.MalformedCookieException; -import org.apache.http.cookie.params.CookieSpecPNames; -import org.apache.http.impl.cookie.NetscapeDomainHandler; -import org.apache.http.impl.cookie.NetscapeDraftSpec; -import org.apache.http.params.HttpParams; -import org.apache.http.protocol.HttpContext; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -31,6 +14,22 @@ import org.apache.http.protocol.HttpContext; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.impl; + +import java.util.Collection; + +import org.apache.http.cookie.ClientCookie; +import org.apache.http.cookie.Cookie; +import org.apache.http.cookie.CookieOrigin; +import org.apache.http.cookie.CookieSpec; +import org.apache.http.cookie.CookieSpecFactory; +import org.apache.http.cookie.CookieSpecProvider; +import org.apache.http.cookie.MalformedCookieException; +import org.apache.http.cookie.params.CookieSpecPNames; +import org.apache.http.impl.cookie.NetscapeDomainHandler; +import org.apache.http.impl.cookie.NetscapeDraftSpec; +import org.apache.http.params.HttpParams; +import org.apache.http.protocol.HttpContext; @SuppressWarnings("deprecation") public class SolrPortAwareCookieSpecFactory implements CookieSpecFactory, CookieSpecProvider { diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java index 36ebda0fd74..e794dab5164 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/XMLResponseParser.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.impl; import org.apache.solr.client.solrj.ResponseParser; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/package-info.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/package-info.java index 491ef057ec1..f3a1fe5f900 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/package-info.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Concrete implementations of client API classes. diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/SolrClientCache.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/SolrClientCache.java index d830576eb40..7e3abd1f84a 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/SolrClientCache.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/SolrClientCache.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.io; - /* * 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.io; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.io; import java.io.IOException; import java.io.Serializable; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/Tuple.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/Tuple.java index 24699c42f6b..dee19abea60 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/Tuple.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/Tuple.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.io; import java.util.HashMap; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/ComparatorLambda.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/ComparatorLambda.java index 90346bf59cf..1f8a8be984d 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/ComparatorLambda.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/ComparatorLambda.java @@ -1,9 +1,3 @@ -package org.apache.solr.client.solrj.io.comp; - -import java.io.Serializable; - -import org.apache.solr.client.solrj.io.Tuple; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -20,6 +14,11 @@ import org.apache.solr.client.solrj.io.Tuple; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.io.comp; + +import java.io.Serializable; + +import org.apache.solr.client.solrj.io.Tuple; /** * Interface for use with a comparator lambda diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/ComparatorOrder.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/ComparatorOrder.java index 144ddb5833b..e6e7af013a0 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/ComparatorOrder.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/ComparatorOrder.java @@ -1,7 +1,3 @@ -package org.apache.solr.client.solrj.io.comp; - -import java.util.Locale; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import java.util.Locale; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.io.comp; + +import java.util.Locale; /** * Enum for supported comparator ordering diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/FieldComparator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/FieldComparator.java index 695b935613c..c3a22891b19 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/FieldComparator.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/FieldComparator.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.io.comp; import java.util.Map; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/HashKey.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/HashKey.java index fde5208a897..09fe30f1ca3 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/HashKey.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/HashKey.java @@ -1,4 +1,3 @@ -package org.apache.solr.client.solrj.io.comp; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.client.solrj.io.comp; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.client.solrj.io.comp; import java.io.Serializable; import org.apache.solr.client.solrj.io.Tuple; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/MultipleFieldComparator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/MultipleFieldComparator.java index 5dd3e8d3cbf..44edc25f4ed 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/MultipleFieldComparator.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/MultipleFieldComparator.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.io.comp; import java.io.IOException; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/StreamComparator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/StreamComparator.java index c5fe11b741b..156a19cd1a3 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/StreamComparator.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/StreamComparator.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.io.comp; import java.io.Serializable; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/package-info.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/package-info.java index 6420c54a1a7..07e83dfe94d 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/package-info.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/package-info.java @@ -14,9 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - - /** * Comparators for the Streaming Aggregation API **/ diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eq/Equalitor.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eq/Equalitor.java index 35f5b3bfb93..4952395d08b 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eq/Equalitor.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eq/Equalitor.java @@ -1,6 +1,3 @@ -package org.apache.solr.client.solrj.io.eq; - - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +14,8 @@ package org.apache.solr.client.solrj.io.eq; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.io.eq; + /** * Interface defining a way to determine if two items are equal diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eq/FieldEqualitor.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eq/FieldEqualitor.java index 3e3003275fb..50b8e229684 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eq/FieldEqualitor.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eq/FieldEqualitor.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.io.eq; import java.io.Serializable; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eq/MultipleFieldEqualitor.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eq/MultipleFieldEqualitor.java index 4bcd59d4d94..982018e446d 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eq/MultipleFieldEqualitor.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eq/MultipleFieldEqualitor.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.io.eq; import java.io.IOException; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eq/StreamEqualitor.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eq/StreamEqualitor.java index 81b08001e7e..70a4cd6b6d3 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eq/StreamEqualitor.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eq/StreamEqualitor.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.io.eq; import java.io.Serializable; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eq/package-info.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eq/package-info.java index fd525ded618..7b3cc55b9da 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eq/package-info.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eq/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Equalitors for the Streaming Aggregation API **/ diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/ConcatOperation.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/ConcatOperation.java index 84b42228a3b..a31be43094d 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/ConcatOperation.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/ConcatOperation.java @@ -1,15 +1,3 @@ -package org.apache.solr.client.solrj.io.ops; - -import java.io.IOException; -import java.util.Locale; - -import org.apache.solr.client.solrj.io.Tuple; -import org.apache.solr.client.solrj.io.stream.expr.StreamExpression; -import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionNamedParameter; -import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionParameter; -import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionValue; -import org.apache.solr.client.solrj.io.stream.expr.StreamFactory; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -26,6 +14,17 @@ import org.apache.solr.client.solrj.io.stream.expr.StreamFactory; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.io.ops; + +import java.io.IOException; +import java.util.Locale; + +import org.apache.solr.client.solrj.io.Tuple; +import org.apache.solr.client.solrj.io.stream.expr.StreamExpression; +import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionNamedParameter; +import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionParameter; +import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionValue; +import org.apache.solr.client.solrj.io.stream.expr.StreamFactory; /** * Concatenates fields and adds them to the tuple. Example diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/DistinctOperation.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/DistinctOperation.java index 67a5ac2e77e..682fe3b9c39 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/DistinctOperation.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/DistinctOperation.java @@ -1,3 +1,19 @@ +/* + * 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.client.solrj.io.ops; import org.apache.solr.client.solrj.io.Tuple; @@ -23,23 +39,6 @@ import java.util.HashMap; import java.util.LinkedList; import java.util.PriorityQueue; -/* - * 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 DistinctOperation implements ReduceOperation { private static final long serialVersionUID = 1L; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/GroupOperation.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/GroupOperation.java index fff7e94bb2b..1687352374b 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/GroupOperation.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/GroupOperation.java @@ -1,3 +1,19 @@ +/* + * 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.client.solrj.io.ops; import org.apache.solr.client.solrj.io.Tuple; @@ -21,23 +37,6 @@ import java.util.HashMap; import java.util.LinkedList; import java.util.PriorityQueue; -/* - * 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 GroupOperation implements ReduceOperation { private PriorityQueue priorityQueue; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/ReduceOperation.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/ReduceOperation.java index 10fa5c6d2b2..38c267584b2 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/ReduceOperation.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/ReduceOperation.java @@ -1,7 +1,3 @@ -package org.apache.solr.client.solrj.io.ops; - -import org.apache.solr.client.solrj.io.Tuple; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,7 +14,9 @@ import org.apache.solr.client.solrj.io.Tuple; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.io.ops; +import org.apache.solr.client.solrj.io.Tuple; public interface ReduceOperation extends StreamOperation { public Tuple reduce(); diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/ReplaceOperation.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/ReplaceOperation.java index 7ccd9da5b3d..e569c0df7dc 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/ReplaceOperation.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/ReplaceOperation.java @@ -1,14 +1,3 @@ -package org.apache.solr.client.solrj.io.ops; - -import java.io.IOException; -import java.util.Locale; - -import org.apache.solr.client.solrj.io.Tuple; -import org.apache.solr.client.solrj.io.stream.expr.StreamExpression; -import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionNamedParameter; -import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionParameter; -import org.apache.solr.client.solrj.io.stream.expr.StreamFactory; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -25,6 +14,16 @@ import org.apache.solr.client.solrj.io.stream.expr.StreamFactory; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.io.ops; + +import java.io.IOException; +import java.util.Locale; + +import org.apache.solr.client.solrj.io.Tuple; +import org.apache.solr.client.solrj.io.stream.expr.StreamExpression; +import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionNamedParameter; +import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionParameter; +import org.apache.solr.client.solrj.io.stream.expr.StreamFactory; /** * Replaces some tuple value with another. The replacement value can be either a given value or the diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/ReplaceWithFieldOperation.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/ReplaceWithFieldOperation.java index 4b2cc0569e9..0dcdeceba02 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/ReplaceWithFieldOperation.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/ReplaceWithFieldOperation.java @@ -1,15 +1,3 @@ -package org.apache.solr.client.solrj.io.ops; - -import java.io.IOException; -import java.util.Locale; - -import org.apache.solr.client.solrj.io.Tuple; -import org.apache.solr.client.solrj.io.stream.expr.StreamExpression; -import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionNamedParameter; -import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionParameter; -import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionValue; -import org.apache.solr.client.solrj.io.stream.expr.StreamFactory; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -26,6 +14,17 @@ import org.apache.solr.client.solrj.io.stream.expr.StreamFactory; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.io.ops; + +import java.io.IOException; +import java.util.Locale; + +import org.apache.solr.client.solrj.io.Tuple; +import org.apache.solr.client.solrj.io.stream.expr.StreamExpression; +import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionNamedParameter; +import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionParameter; +import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionValue; +import org.apache.solr.client.solrj.io.stream.expr.StreamFactory; /** * Implementation of replace(...., withField=fieldName) diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/ReplaceWithValueOperation.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/ReplaceWithValueOperation.java index c3dc18474cd..8b74e2a0c28 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/ReplaceWithValueOperation.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/ReplaceWithValueOperation.java @@ -1,15 +1,3 @@ -package org.apache.solr.client.solrj.io.ops; - -import java.io.IOException; -import java.util.Locale; - -import org.apache.solr.client.solrj.io.Tuple; -import org.apache.solr.client.solrj.io.stream.expr.StreamExpression; -import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionNamedParameter; -import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionParameter; -import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionValue; -import org.apache.solr.client.solrj.io.stream.expr.StreamFactory; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -26,6 +14,17 @@ import org.apache.solr.client.solrj.io.stream.expr.StreamFactory; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.io.ops; + +import java.io.IOException; +import java.util.Locale; + +import org.apache.solr.client.solrj.io.Tuple; +import org.apache.solr.client.solrj.io.stream.expr.StreamExpression; +import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionNamedParameter; +import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionParameter; +import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionValue; +import org.apache.solr.client.solrj.io.stream.expr.StreamFactory; /** * Implementation of replace(...., withValue="some value") diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/StreamOperation.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/StreamOperation.java index a9d381ee896..643628fa95e 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/StreamOperation.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/StreamOperation.java @@ -1,13 +1,3 @@ -package org.apache.solr.client.solrj.io.ops; - -import java.io.IOException; -import java.io.Serializable; - -import org.apache.solr.client.solrj.io.Tuple; -import org.apache.solr.client.solrj.io.stream.expr.Expressible; -import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionParameter; -import org.apache.solr.client.solrj.io.stream.expr.StreamFactory; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -24,6 +14,15 @@ import org.apache.solr.client.solrj.io.stream.expr.StreamFactory; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.io.ops; + +import java.io.IOException; +import java.io.Serializable; + +import org.apache.solr.client.solrj.io.Tuple; +import org.apache.solr.client.solrj.io.stream.expr.Expressible; +import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionParameter; +import org.apache.solr.client.solrj.io.stream.expr.StreamFactory; /** * Interface for any operation one can perform on a tuple in a TupleStream diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/package-info.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/package-info.java index 0e9ffd08129..b063a3d3629 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/package-info.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Operations for the Streaming Aggregation API **/ diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/package-info.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/package-info.java index 5be9c12a182..281088419c2 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/package-info.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/package-info.java @@ -14,9 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - - /** * Streaming Aggregation API **/ diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/ConnectionImpl.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/ConnectionImpl.java index a9d73d41ea1..9f9c00ec9ec 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/ConnectionImpl.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/ConnectionImpl.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.io.sql; - /* * 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.io.sql; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.io.sql; import java.sql.Array; import java.sql.Blob; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/DatabaseMetaDataImpl.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/DatabaseMetaDataImpl.java index 6d3ee5dde65..33cd94e94ce 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/DatabaseMetaDataImpl.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/DatabaseMetaDataImpl.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.io.sql; - /* * 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.io.sql; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.io.sql; import java.sql.Connection; import java.sql.DatabaseMetaData; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/DriverImpl.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/DriverImpl.java index 57d60ca0160..6caa1d48851 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/DriverImpl.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/DriverImpl.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.io.sql; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,7 +14,7 @@ package org.apache.solr.client.solrj.io.sql; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.client.solrj.io.sql; import java.net.URI; import java.net.URISyntaxException; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/ResultSetImpl.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/ResultSetImpl.java index 7367b6fea95..e2f8cf04f4b 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/ResultSetImpl.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/ResultSetImpl.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.io.sql; - /* * 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.io.sql; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.io.sql; import java.io.IOException; import java.io.InputStream; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/ResultSetMetaDataImpl.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/ResultSetMetaDataImpl.java index 1dab2576d7a..c32ed43e727 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/ResultSetMetaDataImpl.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/ResultSetMetaDataImpl.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.io.sql; - /* * 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.io.sql; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.io.sql; import java.sql.ResultSetMetaData; import java.sql.SQLException; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/StatementImpl.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/StatementImpl.java index 14bae09eb4d..77cebfe6149 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/StatementImpl.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/StatementImpl.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.io.sql; - /* * 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.io.sql; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.io.sql; import java.io.IOException; import java.sql.Connection; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/package-info.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/package-info.java index cce60be012e..bba2366c058 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/package-info.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * JDBC Driver Package * diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/BiJoinStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/BiJoinStream.java index 7382455079e..29a4a787d2a 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/BiJoinStream.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/BiJoinStream.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.io.stream; import java.io.IOException; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CloudSolrStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CloudSolrStream.java index f63c6427c13..730097f9ec5 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CloudSolrStream.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/CloudSolrStream.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.io.stream; import java.io.IOException; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ComplementStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ComplementStream.java index 3b42d7e21cc..bd3c2336d6d 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ComplementStream.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ComplementStream.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.io.stream; import java.io.IOException; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/DaemonStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/DaemonStream.java index 1b62267a60c..2d96c09bc55 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/DaemonStream.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/DaemonStream.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.apache.solr.client.solrj.io.stream; import org.apache.solr.client.solrj.io.Tuple; import org.apache.solr.client.solrj.io.comp.StreamComparator; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ExceptionStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ExceptionStream.java index 0979f3ac4d6..e442d1b564c 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ExceptionStream.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ExceptionStream.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.io.stream; import java.io.IOException; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/FacetStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/FacetStream.java index e34a82c949b..e4ae04cba68 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/FacetStream.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/FacetStream.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.io.stream; - /* * 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.io.stream; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.io.stream; import java.io.IOException; import java.util.HashMap; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/HashJoinStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/HashJoinStream.java index 068a0916684..717e8e5d1a3 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/HashJoinStream.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/HashJoinStream.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.io.stream; import java.io.IOException; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/InnerJoinStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/InnerJoinStream.java index 2dca0938de5..3e1a7720215 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/InnerJoinStream.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/InnerJoinStream.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.io.stream; import java.io.IOException; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/IntersectStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/IntersectStream.java index 230083d7621..273ca60dd8d 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/IntersectStream.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/IntersectStream.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.io.stream; import java.io.IOException; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/JDBCStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/JDBCStream.java index efad8911573..a98f2e42425 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/JDBCStream.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/JDBCStream.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.io.stream; import java.io.IOException; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/JSONTupleStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/JSONTupleStream.java index 1b962fd735b..5493298d7df 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/JSONTupleStream.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/JSONTupleStream.java @@ -1,3 +1,19 @@ +/* + * 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.client.solrj.io.stream; import java.io.IOException; @@ -19,23 +35,6 @@ import org.noggit.JSONParser; import org.noggit.ObjectBuilder; -/* - * 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. - */ - /* Queries a Solr instance, and maps SolrDocs to Tuples. Initial version works with the json format and only SolrDocs are handled. diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/JoinStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/JoinStream.java index 3be983dd2f7..69df46304f7 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/JoinStream.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/JoinStream.java @@ -1,3 +1,19 @@ +/* + * 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.client.solrj.io.stream; import java.io.IOException; @@ -16,23 +32,6 @@ import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionNamedParamete import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionValue; import org.apache.solr.client.solrj.io.stream.expr.StreamFactory; -/* - * 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. - */ - /** Defines a JoinStream which can hold N streams, all joined with the same equalitor */ public abstract class JoinStream extends TupleStream implements Expressible { diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/LeftOuterJoinStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/LeftOuterJoinStream.java index 358fa38fcc9..aee1495dbff 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/LeftOuterJoinStream.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/LeftOuterJoinStream.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.io.stream; import java.io.IOException; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/MergeStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/MergeStream.java index ee776483e52..2ea926cbd58 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/MergeStream.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/MergeStream.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.io.stream; import java.io.IOException; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/OuterHashJoinStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/OuterHashJoinStream.java index dfb83bfe049..23a99a52416 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/OuterHashJoinStream.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/OuterHashJoinStream.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.io.stream; import java.io.IOException; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ParallelStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ParallelStream.java index d2e684910e5..c75738fe02e 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ParallelStream.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ParallelStream.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.io.stream; import java.io.ByteArrayOutputStream; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/PushBackStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/PushBackStream.java index f39c8adaaca..527da21a046 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/PushBackStream.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/PushBackStream.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.io.stream; import java.io.IOException; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/RankStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/RankStream.java index fb3c304d1ae..5a8b2187f01 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/RankStream.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/RankStream.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.io.stream; import java.io.IOException; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ReducerStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ReducerStream.java index 04cb53537fa..930c01dd421 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ReducerStream.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ReducerStream.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.io.stream; import java.io.IOException; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/RollupStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/RollupStream.java index c4796998d74..106651c5f88 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/RollupStream.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/RollupStream.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.apache.solr.client.solrj.io.stream; import java.io.IOException; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SelectStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SelectStream.java index 2e9d9ada1bc..ff95f354d66 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SelectStream.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SelectStream.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.io.stream; import java.io.IOException; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SolrStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SolrStream.java index 972fa93be91..abd98c83b72 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SolrStream.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SolrStream.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.io.stream; import java.io.IOException; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/StatsStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/StatsStream.java index bab8449f014..478bc56074e 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/StatsStream.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/StatsStream.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.io.stream; - /* * 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.io.stream; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.io.stream; import java.io.IOException; import java.util.ArrayList; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/StreamContext.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/StreamContext.java index caf638e69fd..ff0aefa4d9a 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/StreamContext.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/StreamContext.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.io.stream; import java.io.Serializable; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TupleStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TupleStream.java index 4ea355df3e3..858e7b61830 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TupleStream.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TupleStream.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.io.stream; import java.io.IOException; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/UniqueStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/UniqueStream.java index 82002328fe7..83d38f499cf 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/UniqueStream.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/UniqueStream.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.io.stream; import java.io.IOException; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/Expressible.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/Expressible.java index b87ff531d2b..b44bb558836 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/Expressible.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/Expressible.java @@ -1,7 +1,3 @@ -package org.apache.solr.client.solrj.io.stream.expr; - -import java.io.IOException; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import java.io.IOException; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.io.stream.expr; + +import java.io.IOException; /** * Defines a stream that can be expressed in an expression diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpression.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpression.java index d8dc13aa559..35d9f52ed4d 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpression.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpression.java @@ -1,8 +1,3 @@ -package org.apache.solr.client.solrj.io.stream.expr; - -import java.util.ArrayList; -import java.util.List; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -19,6 +14,10 @@ import java.util.List; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.io.stream.expr; + +import java.util.ArrayList; +import java.util.List; /** * Expression containing a function and set of parameters diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionNamedParameter.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionNamedParameter.java index cc1233c9ac8..5c9f53c334f 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionNamedParameter.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionNamedParameter.java @@ -1,6 +1,3 @@ -package org.apache.solr.client.solrj.io.stream.expr; - - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +14,8 @@ package org.apache.solr.client.solrj.io.stream.expr; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.io.stream.expr; + /** * Provides a named parameter diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionParameter.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionParameter.java index 415ade56d5b..8f4bf20048f 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionParameter.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionParameter.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.io.stream.expr; - /* * 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.io.stream.expr; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.io.stream.expr; /** * Base interface of a stream parameter diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionParser.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionParser.java index 1593f09a075..294115ad5ef 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionParser.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionParser.java @@ -1,10 +1,3 @@ -package org.apache.solr.client.solrj.io.stream.expr; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Locale; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -21,6 +14,12 @@ import java.util.Locale; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.io.stream.expr; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Locale; /** * Takes a prefix notation expression and returns a tokenized expression diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionValue.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionValue.java index bc7da8c8ff3..20a3f959142 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionValue.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionValue.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.io.stream.expr; - /* * 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.io.stream.expr; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.io.stream.expr; /** * Basic string stream expression diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamFactory.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamFactory.java index 201c30dbf1e..7f574fd645e 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamFactory.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamFactory.java @@ -1,3 +1,19 @@ +/* + * 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.client.solrj.io.stream.expr; import java.io.IOException; @@ -20,23 +36,6 @@ import org.apache.solr.client.solrj.io.ops.StreamOperation; import org.apache.solr.client.solrj.io.stream.TupleStream; import org.apache.solr.client.solrj.io.stream.metrics.Metric; -/* - * 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. - */ - /** * Used to convert strings into stream expressions */ diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/package-info.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/package-info.java index 8c21dd586c4..35c2b532918 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/package-info.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/package-info.java @@ -14,9 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - - /** * Expression language for the Streaming Aggregation API **/ diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/Bucket.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/Bucket.java index 62e5990e14a..12ee2815e5d 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/Bucket.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/Bucket.java @@ -1,5 +1,3 @@ - package org.apache.solr.client.solrj.io.stream.metrics; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,10 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -/* -* -*/ +package org.apache.solr.client.solrj.io.stream.metrics; import java.io.Serializable; import org.apache.solr.client.solrj.io.Tuple; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/CountMetric.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/CountMetric.java index 8a56164d541..0e19177ff05 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/CountMetric.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/CountMetric.java @@ -1,4 +1,3 @@ -package org.apache.solr.client.solrj.io.stream.metrics; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.client.solrj.io.stream.metrics; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.client.solrj.io.stream.metrics; import java.io.IOException; import java.io.Serializable; import java.util.Locale; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/MaxMetric.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/MaxMetric.java index 857106c32e3..8f2069e472d 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/MaxMetric.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/MaxMetric.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.io.stream.metrics; - /* * 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.io.stream.metrics; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.io.stream.metrics; import java.io.IOException; import java.io.Serializable; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/MeanMetric.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/MeanMetric.java index aa7757992f8..0a5726c95bc 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/MeanMetric.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/MeanMetric.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.io.stream.metrics; - /* * 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.io.stream.metrics; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.io.stream.metrics; import java.io.IOException; import java.io.Serializable; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/Metric.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/Metric.java index 6d17280552f..e7321828dd0 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/Metric.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/Metric.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.io.stream.metrics; - /* * 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.io.stream.metrics; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.io.stream.metrics; import java.io.Serializable; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/MinMetric.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/MinMetric.java index 48b77ae13ec..7c6060e9ddf 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/MinMetric.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/MinMetric.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.io.stream.metrics; - /* * 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.io.stream.metrics; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.io.stream.metrics; import java.io.IOException; import java.util.Locale; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/SumMetric.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/SumMetric.java index f709530b450..805f9781283 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/SumMetric.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/SumMetric.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.io.stream.metrics; - /* * 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.io.stream.metrics; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.io.stream.metrics; import java.io.IOException; import java.io.Serializable; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/package-info.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/package-info.java index a25732e9a2f..50f4f8e158e 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/package-info.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/package-info.java @@ -14,9 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - - /** * Metrics package **/ diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/package-info.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/package-info.java index 92a60344058..3dec906ec05 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/package-info.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/package-info.java @@ -14,9 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - - /** * Stream implementations for the Streaming Aggregation API **/ diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/package-info.java b/solr/solrj/src/java/org/apache/solr/client/solrj/package-info.java index 70a83dd76e2..b0980950ddd 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/package-info.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Primary APIs for communicating with a Solr Server from a Java client. **/ diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/AbstractUpdateRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/AbstractUpdateRequest.java index 8fbc4636d45..d1675fc3fa8 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/AbstractUpdateRequest.java +++ b/solr/solrj/src/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 @@ -15,7 +14,7 @@ package org.apache.solr.client.solrj.request; * See the License for the specific language governing permissions and * 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; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java index 43094ec2330..cec7e0b016d 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.request; import org.apache.solr.client.solrj.SolrClient; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/ConfigSetAdminRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/ConfigSetAdminRequest.java index 14f4f46b50a..2e34f9c24c7 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/ConfigSetAdminRequest.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/ConfigSetAdminRequest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.request; import java.io.IOException; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/ContentStreamUpdateRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/ContentStreamUpdateRequest.java index 2697e3f0493..f0e0b3cd048 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/ContentStreamUpdateRequest.java +++ b/solr/solrj/src/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 @@ -15,8 +14,7 @@ package org.apache.solr.client.solrj.request; * See the License for the specific language governing permissions and * 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; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/CoreAdminRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/CoreAdminRequest.java index db10cb9e354..188a9ea2bba 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/CoreAdminRequest.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/CoreAdminRequest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.request; import org.apache.solr.client.solrj.SolrClient; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/DirectXmlRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/DirectXmlRequest.java index 1efaaf55d3d..766dfeb157a 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/DirectXmlRequest.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/DirectXmlRequest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.request; import org.apache.solr.client.solrj.SolrClient; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/DocumentAnalysisRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/DocumentAnalysisRequest.java index 92e2064c98a..6de2dc33bf2 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/DocumentAnalysisRequest.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/DocumentAnalysisRequest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.request; import org.apache.solr.client.solrj.SolrClient; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/FieldAnalysisRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/FieldAnalysisRequest.java index 66ef535aa79..8d5e7385ffe 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/FieldAnalysisRequest.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/FieldAnalysisRequest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.request; import org.apache.solr.client.solrj.SolrClient; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/GenericSolrRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/GenericSolrRequest.java index 9c9f7d49b4c..558d7d41fdf 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/GenericSolrRequest.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/GenericSolrRequest.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 @@ -16,6 +14,7 @@ package org.apache.solr.client.solrj.request; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.request; import java.io.IOException; import java.util.Collection; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/IsUpdateRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/IsUpdateRequest.java index ec49e305a07..15e2d3ec0d2 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/IsUpdateRequest.java +++ b/solr/solrj/src/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 @@ -16,7 +14,7 @@ package org.apache.solr.client.solrj.request; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.client.solrj.request; /** * Marker class so that we can determine which requests are updates. diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/LukeRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/LukeRequest.java index 82b533081cd..1ccb18aba33 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/LukeRequest.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/LukeRequest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.request; import org.apache.solr.client.solrj.SolrClient; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/QueryRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/QueryRequest.java index 9d47f992053..5b2fe959cc3 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/QueryRequest.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/QueryRequest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.request; import org.apache.solr.client.solrj.SolrClient; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/RequestWriter.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/RequestWriter.java index 15872b25bc7..89c29d6e9aa 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/RequestWriter.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/RequestWriter.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.request; import org.apache.solr.client.solrj.SolrRequest; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/SolrPing.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/SolrPing.java index 00ad41f406b..13d9e4caded 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/SolrPing.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/SolrPing.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.request; import org.apache.solr.client.solrj.SolrClient; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/UpdateRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/UpdateRequest.java index c83639b8e91..0d331d25efb 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/UpdateRequest.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/UpdateRequest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.request; import java.io.IOException; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/package-info.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/package-info.java index 899a562783f..44693343c0c 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/package-info.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Convenience classes for dealing with various types of Solr requests. */ diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/schema/AbstractSchemaRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/schema/AbstractSchemaRequest.java index 661d167d012..0f49530bb92 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/schema/AbstractSchemaRequest.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/schema/AbstractSchemaRequest.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.request.schema; - /* * 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.request.schema; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.request.schema; import java.io.IOException; import java.util.Collection; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/schema/AnalyzerDefinition.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/schema/AnalyzerDefinition.java index ed5aeb5878f..b8281d07b01 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/schema/AnalyzerDefinition.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/schema/AnalyzerDefinition.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.request.schema; - /* * 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.request.schema; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.request.schema; import java.util.List; import java.util.Map; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/schema/FieldTypeDefinition.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/schema/FieldTypeDefinition.java index 4599f4b0ae1..2eb1530c56a 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/schema/FieldTypeDefinition.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/schema/FieldTypeDefinition.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.request.schema; - /* * 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.request.schema; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.request.schema; import java.util.Map; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/schema/SchemaRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/schema/SchemaRequest.java index 769e9bd4d6c..1c92b407175 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/schema/SchemaRequest.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/schema/SchemaRequest.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.request.schema; - /* * 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.request.schema; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.request.schema; import java.io.IOException; import java.util.Collection; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/schema/package-info.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/schema/package-info.java index 874d16b1ce9..ce7a916505b 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/schema/package-info.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/schema/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Convenience classes for making Schema API requests. *

    diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/AnalysisResponseBase.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/AnalysisResponseBase.java index 21396a5d2a7..b2d18842ea0 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/AnalysisResponseBase.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/AnalysisResponseBase.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.response; import org.apache.solr.common.util.NamedList; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/Cluster.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/Cluster.java index 9f4e196d05f..ae3e529dab4 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/Cluster.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/Cluster.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.util.List; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/ClusteringResponse.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/ClusteringResponse.java index 3f29ecd984a..ad6e0484970 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/ClusteringResponse.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/ClusteringResponse.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 @@ -15,7 +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.util.LinkedList; import java.util.List; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/CollectionAdminResponse.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/CollectionAdminResponse.java index 8acf2e2c43b..82d4d6f06d9 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/CollectionAdminResponse.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/CollectionAdminResponse.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.response; import java.util.HashMap; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/ConfigSetAdminResponse.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/ConfigSetAdminResponse.java index 8c6787365af..dc05f6d6b65 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/ConfigSetAdminResponse.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/ConfigSetAdminResponse.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.response; import org.apache.solr.common.util.NamedList; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/CoreAdminResponse.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/CoreAdminResponse.java index 0492165ba56..c46fe74d51e 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/CoreAdminResponse.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/CoreAdminResponse.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.response; import java.util.Date; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/DocumentAnalysisResponse.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/DocumentAnalysisResponse.java index 2f11d78bddc..42c20e9d697 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/DocumentAnalysisResponse.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/DocumentAnalysisResponse.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.response; import org.apache.solr.common.util.NamedList; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/FacetField.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/FacetField.java index 086c9991d70..a1f6a490979 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/FacetField.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/FacetField.java @@ -14,7 +14,6 @@ * 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; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/FieldAnalysisResponse.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/FieldAnalysisResponse.java index 9c542d7f837..3a9a1938628 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/FieldAnalysisResponse.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/FieldAnalysisResponse.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.response; import org.apache.solr.common.util.NamedList; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/Group.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/Group.java index 2ee0389fbc6..853a5479095 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/Group.java +++ b/solr/solrj/src/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 @@ -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 org.apache.solr.common.SolrDocumentList; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/GroupCommand.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/GroupCommand.java index c2c81274bb0..fd2bdb70aad 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/GroupCommand.java +++ b/solr/solrj/src/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 @@ -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; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/GroupResponse.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/GroupResponse.java index 210bb5e8341..420f743c660 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/GroupResponse.java +++ b/solr/solrj/src/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; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/IntervalFacet.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/IntervalFacet.java index 1f91fe887a9..12c5e08aec9 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/IntervalFacet.java +++ b/solr/solrj/src/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,10 @@ 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. diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/LukeResponse.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/LukeResponse.java index 5d2f3282da1..a2e8285ee97 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/LukeResponse.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/LukeResponse.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.response; import org.apache.solr.common.luke.FieldFlag; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/PivotField.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/PivotField.java index 6c82b6f3350..fb095f79c1b 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/PivotField.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/PivotField.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.response; import java.io.PrintStream; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/QueryResponse.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/QueryResponse.java index bd7d74850fc..d01188af19b 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/QueryResponse.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/QueryResponse.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.response; import java.util.ArrayList; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/RangeFacet.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/RangeFacet.java index 52b4e6b98d1..6829c17b61b 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/RangeFacet.java +++ b/solr/solrj/src/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 @@ -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.util.ArrayList; import java.util.List; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/SimpleSolrResponse.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/SimpleSolrResponse.java index e7e8c9e80d6..1ee019fe895 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/SimpleSolrResponse.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/SimpleSolrResponse.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,7 +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 org.apache.solr.client.solrj.SolrResponse; import org.apache.solr.common.util.NamedList; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/SolrPingResponse.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/SolrPingResponse.java index cbd892fdb5d..fc7b5302a36 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/SolrPingResponse.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/SolrPingResponse.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.response; /** diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/SolrResponseBase.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/SolrResponseBase.java index ca59e54c354..d20481c3193 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/SolrResponseBase.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/SolrResponseBase.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.response; import org.apache.solr.client.solrj.SolrResponse; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/SpellCheckResponse.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/SpellCheckResponse.java index a3ae45daa16..946225dceb9 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/SpellCheckResponse.java +++ b/solr/solrj/src/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 @@ -15,7 +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 org.apache.solr.common.util.NamedList; import java.util.ArrayList; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/SuggesterResponse.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/SuggesterResponse.java index 8ce0a3e0579..e009dfe57c1 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/SuggesterResponse.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/SuggesterResponse.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 @@ -15,7 +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.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/Suggestion.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/Suggestion.java index 1a3a94c7d4a..88bc5faaebb 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/Suggestion.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/Suggestion.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 @@ -15,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; /** * This class models a Suggestion coming from Solr Suggest Component. * It is a direct mapping fo the Json object Solr is returning. diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/TermsResponse.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/TermsResponse.java index 5d8c0b7db48..e3fb0612564 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/TermsResponse.java +++ b/solr/solrj/src/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 @@ -15,7 +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 org.apache.solr.common.util.NamedList; import java.util.ArrayList; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/UpdateResponse.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/UpdateResponse.java index 7a62bc0f9af..dfe84e81031 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/UpdateResponse.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/UpdateResponse.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.response; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/package-info.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/package-info.java index e2bbe3aa3e4..3583f6a0cc2 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/package-info.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Convenience classes for dealing with various types of Solr responses. diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/schema/FieldTypeRepresentation.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/schema/FieldTypeRepresentation.java index 36d31d8f55b..b248690f4d2 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/schema/FieldTypeRepresentation.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/schema/FieldTypeRepresentation.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.response.schema; - /* * 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.schema; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.response.schema; import java.util.List; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/schema/SchemaRepresentation.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/schema/SchemaRepresentation.java index 7e6df8b1dfd..98170982a70 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/schema/SchemaRepresentation.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/schema/SchemaRepresentation.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.response.schema; - /* * 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.schema; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.response.schema; import java.util.List; import java.util.Map; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/schema/SchemaResponse.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/schema/SchemaResponse.java index 5a4bdb7396d..0f3b2896430 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/schema/SchemaResponse.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/schema/SchemaResponse.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.response.schema; - /* * 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.schema; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.response.schema; import java.util.LinkedHashMap; import java.util.LinkedList; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/schema/package-info.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/schema/package-info.java index fe55e040fd2..0f6f258a324 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/schema/package-info.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/schema/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Convenience classes for dealing with Schema API responses. *

    diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/util/ClientUtils.java b/solr/solrj/src/java/org/apache/solr/client/solrj/util/ClientUtils.java index 5c5cc473fdf..54c4b6ec36a 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/util/ClientUtils.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/util/ClientUtils.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.util; import org.apache.solr.common.SolrDocument; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/util/package-info.java b/solr/solrj/src/java/org/apache/solr/client/solrj/util/package-info.java index 9464970719d..ee1db5f23a2 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/util/package-info.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/util/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Utilities for Solr client applications. */ diff --git a/solr/solrj/src/java/org/apache/solr/common/Callable.java b/solr/solrj/src/java/org/apache/solr/common/Callable.java index 3c5e0d08a19..f913b8ef8b5 100644 --- a/solr/solrj/src/java/org/apache/solr/common/Callable.java +++ b/solr/solrj/src/java/org/apache/solr/common/Callable.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 @@ -16,6 +14,7 @@ package org.apache.solr.common; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common; public interface Callable { public void call(T data); // data depends on the context diff --git a/solr/solrj/src/java/org/apache/solr/common/EmptyEntityResolver.java b/solr/solrj/src/java/org/apache/solr/common/EmptyEntityResolver.java index 61cac6f70e2..6536b95d52b 100644 --- a/solr/solrj/src/java/org/apache/solr/common/EmptyEntityResolver.java +++ b/solr/solrj/src/java/org/apache/solr/common/EmptyEntityResolver.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 @@ -16,6 +14,7 @@ package org.apache.solr.common; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common; import java.io.InputStream; import org.xml.sax.InputSource; diff --git a/solr/solrj/src/java/org/apache/solr/common/EnumFieldValue.java b/solr/solrj/src/java/org/apache/solr/common/EnumFieldValue.java index 50d1fb0a5b2..8966c690030 100644 --- a/solr/solrj/src/java/org/apache/solr/common/EnumFieldValue.java +++ b/solr/solrj/src/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 @@ -16,6 +14,7 @@ package org.apache.solr.common; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common; import java.io.Serializable; diff --git a/solr/solrj/src/java/org/apache/solr/common/SolrDocument.java b/solr/solrj/src/java/org/apache/solr/common/SolrDocument.java index 34dd506471b..b4af06f903b 100644 --- a/solr/solrj/src/java/org/apache/solr/common/SolrDocument.java +++ b/solr/solrj/src/java/org/apache/solr/common/SolrDocument.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common; import java.util.ArrayList; diff --git a/solr/solrj/src/java/org/apache/solr/common/SolrDocumentBase.java b/solr/solrj/src/java/org/apache/solr/common/SolrDocumentBase.java index aa53669eb15..7891f10c409 100644 --- a/solr/solrj/src/java/org/apache/solr/common/SolrDocumentBase.java +++ b/solr/solrj/src/java/org/apache/solr/common/SolrDocumentBase.java @@ -1,10 +1,3 @@ -package org.apache.solr.common; - -import java.io.Serializable; -import java.util.Collection; -import java.util.List; -import java.util.Map; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -21,6 +14,12 @@ import java.util.Map; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common; + +import java.io.Serializable; +import java.util.Collection; +import java.util.List; +import java.util.Map; public abstract class SolrDocumentBase implements Map, Serializable { diff --git a/solr/solrj/src/java/org/apache/solr/common/SolrDocumentList.java b/solr/solrj/src/java/org/apache/solr/common/SolrDocumentList.java index d803e7dc6c3..58758337adf 100644 --- a/solr/solrj/src/java/org/apache/solr/common/SolrDocumentList.java +++ b/solr/solrj/src/java/org/apache/solr/common/SolrDocumentList.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common; import java.util.ArrayList; diff --git a/solr/solrj/src/java/org/apache/solr/common/SolrException.java b/solr/solrj/src/java/org/apache/solr/common/SolrException.java index f6f353cb455..a30042c367b 100644 --- a/solr/solrj/src/java/org/apache/solr/common/SolrException.java +++ b/solr/solrj/src/java/org/apache/solr/common/SolrException.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common; import java.io.CharArrayWriter; diff --git a/solr/solrj/src/java/org/apache/solr/common/SolrInputDocument.java b/solr/solrj/src/java/org/apache/solr/common/SolrInputDocument.java index 2b2e21f82b8..6796300d6af 100644 --- a/solr/solrj/src/java/org/apache/solr/common/SolrInputDocument.java +++ b/solr/solrj/src/java/org/apache/solr/common/SolrInputDocument.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common; import java.util.ArrayList; diff --git a/solr/solrj/src/java/org/apache/solr/common/SolrInputField.java b/solr/solrj/src/java/org/apache/solr/common/SolrInputField.java index 02b68560b70..261b32619fc 100644 --- a/solr/solrj/src/java/org/apache/solr/common/SolrInputField.java +++ b/solr/solrj/src/java/org/apache/solr/common/SolrInputField.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common; import java.io.Serializable; diff --git a/solr/solrj/src/java/org/apache/solr/common/StringUtils.java b/solr/solrj/src/java/org/apache/solr/common/StringUtils.java index 00fef63aa78..9b8e04257e6 100644 --- a/solr/solrj/src/java/org/apache/solr/common/StringUtils.java +++ b/solr/solrj/src/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 @@ -16,6 +14,7 @@ package org.apache.solr.common; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common; public class StringUtils { diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/Aliases.java b/solr/solrj/src/java/org/apache/solr/common/cloud/Aliases.java index 1d18323c056..e927ddb554b 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/Aliases.java +++ b/solr/solrj/src/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 @@ -16,6 +14,7 @@ package org.apache.solr.common.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common.cloud; import java.util.Collections; import java.util.HashMap; diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/BeforeReconnect.java b/solr/solrj/src/java/org/apache/solr/common/cloud/BeforeReconnect.java index 44379a4b3c2..928e606c920 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/BeforeReconnect.java +++ b/solr/solrj/src/java/org/apache/solr/common/cloud/BeforeReconnect.java @@ -1,21 +1,20 @@ -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 - * 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 - * + * 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. + * 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.common.cloud; public interface BeforeReconnect { public void command(); diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ClosableThread.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ClosableThread.java index 1a19cbdd633..861a9c8ee57 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/ClosableThread.java +++ b/solr/solrj/src/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 @@ -16,6 +14,7 @@ package org.apache.solr.common.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common.cloud; /** * @deprecated because this class is no longer used internally and will be removed diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java index 3a6cf1a24b3..ff0e6a3965f 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java +++ b/solr/solrj/src/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 @@ -16,6 +14,7 @@ package org.apache.solr.common.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common.cloud; import java.util.Collection; import java.util.Collections; diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterStateUtil.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterStateUtil.java index 7ed1aa014e2..1628756a66f 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterStateUtil.java +++ b/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterStateUtil.java @@ -1,24 +1,23 @@ +/* + * 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.common.cloud; import java.lang.invoke.MethodHandles; -/* - * 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. - */ - import java.util.Collection; import java.util.Collections; import java.util.Set; diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/CompositeIdRouter.java b/solr/solrj/src/java/org/apache/solr/common/cloud/CompositeIdRouter.java index 5b1652d4088..a1cd02c44a5 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/CompositeIdRouter.java +++ b/solr/solrj/src/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 @@ -16,6 +14,7 @@ package org.apache.solr.common.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common.cloud; import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrInputDocument; diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java index 2f7e37fa589..c3cf768ca93 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java +++ b/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java @@ -1,7 +1,3 @@ -package org.apache.solr.common.cloud; - -import java.lang.invoke.MethodHandles; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import java.lang.invoke.MethodHandles; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common.cloud; + +import java.lang.invoke.MethodHandles; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/DefaultConnectionStrategy.java b/solr/solrj/src/java/org/apache/solr/common/cloud/DefaultConnectionStrategy.java index 6690fe94422..cbec324b880 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/DefaultConnectionStrategy.java +++ b/solr/solrj/src/java/org/apache/solr/common/cloud/DefaultConnectionStrategy.java @@ -1,21 +1,20 @@ -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 - * 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 - * + * 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. + * 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.common.cloud; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/DefaultZkACLProvider.java b/solr/solrj/src/java/org/apache/solr/common/cloud/DefaultZkACLProvider.java index 9b0301a9525..d06d58a3610 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/DefaultZkACLProvider.java +++ b/solr/solrj/src/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 @@ -21,6 +14,12 @@ import org.apache.zookeeper.data.ACL; * See the License for the specific language governing permissions and * 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 { diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/DefaultZkCredentialsProvider.java b/solr/solrj/src/java/org/apache/solr/common/cloud/DefaultZkCredentialsProvider.java index ca09068e6c0..305d76ba319 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/DefaultZkCredentialsProvider.java +++ b/solr/solrj/src/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 @@ -19,6 +14,10 @@ import java.util.Collection; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common.cloud; + +import java.util.ArrayList; +import java.util.Collection; public class DefaultZkCredentialsProvider implements ZkCredentialsProvider { diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/DocCollection.java b/solr/solrj/src/java/org/apache/solr/common/cloud/DocCollection.java index 5d88715191d..e8f26e1a4cc 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/DocCollection.java +++ b/solr/solrj/src/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 @@ -16,6 +14,7 @@ package org.apache.solr.common.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common.cloud; import java.util.Collection; import java.util.HashMap; diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/DocRouter.java b/solr/solrj/src/java/org/apache/solr/common/cloud/DocRouter.java index 24d00dd0909..e64c0649c9d 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/DocRouter.java +++ b/solr/solrj/src/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 @@ -16,6 +14,7 @@ package org.apache.solr.common.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common.cloud; import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrInputDocument; diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/HashBasedRouter.java b/solr/solrj/src/java/org/apache/solr/common/cloud/HashBasedRouter.java index 4132f01da16..f9ab5d44f51 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/HashBasedRouter.java +++ b/solr/solrj/src/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 @@ -16,6 +14,7 @@ package org.apache.solr.common.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common.cloud; import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrInputDocument; diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ImplicitDocRouter.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ImplicitDocRouter.java index a457b74f908..0b25fcbabaa 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/ImplicitDocRouter.java +++ b/solr/solrj/src/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 @@ -16,6 +14,7 @@ package org.apache.solr.common.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common.cloud; import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrInputDocument; diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/OnReconnect.java b/solr/solrj/src/java/org/apache/solr/common/cloud/OnReconnect.java index e4479820280..4f6b2c685dd 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/OnReconnect.java +++ b/solr/solrj/src/java/org/apache/solr/common/cloud/OnReconnect.java @@ -1,21 +1,20 @@ -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 - * 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 - * + * 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. + * 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.common.cloud; public interface OnReconnect { public void command(); diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/PlainIdRouter.java b/solr/solrj/src/java/org/apache/solr/common/cloud/PlainIdRouter.java index bd14089f0da..f1cea474fd2 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/PlainIdRouter.java +++ b/solr/solrj/src/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 @@ -17,6 +14,8 @@ package org.apache.solr.common.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common.cloud; + public class PlainIdRouter extends HashBasedRouter { public static final String NAME = "plain"; diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/Replica.java b/solr/solrj/src/java/org/apache/solr/common/cloud/Replica.java index 5e7318d6a76..3a31d195658 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/Replica.java +++ b/solr/solrj/src/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 @@ -16,6 +14,7 @@ package org.apache.solr.common.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common.cloud; import static org.apache.solr.common.cloud.ZkStateReader.*; diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/RoutingRule.java b/solr/solrj/src/java/org/apache/solr/common/cloud/RoutingRule.java index 557ed2a89e0..503c39eb105 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/RoutingRule.java +++ b/solr/solrj/src/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 @@ -16,6 +14,7 @@ package org.apache.solr.common.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common.cloud; import java.util.ArrayList; import java.util.List; diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/SaslZkACLProvider.java b/solr/solrj/src/java/org/apache/solr/common/cloud/SaslZkACLProvider.java index 86ab25f19ac..eaccb8ccf5f 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/SaslZkACLProvider.java +++ b/solr/solrj/src/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 @@ -16,6 +14,7 @@ package org.apache.solr.common.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common.cloud; import java.util.ArrayList; import java.util.List; diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/Slice.java b/solr/solrj/src/java/org/apache/solr/common/cloud/Slice.java index 76e47d06d8c..369edbb102c 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/Slice.java +++ b/solr/solrj/src/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 @@ -16,6 +14,7 @@ package org.apache.solr.common.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common.cloud; import org.noggit.JSONUtil; import org.noggit.JSONWriter; diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java b/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java index f0a07afc48d..856fe5b04e3 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java +++ b/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java @@ -1,21 +1,20 @@ -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 - * 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 + * 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 + * 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. + * 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.common.cloud; import org.apache.commons.io.FileUtils; import org.apache.solr.common.SolrException; diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZooKeeper.java b/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZooKeeper.java index 6c6d49e1909..268ba2da334 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZooKeeper.java +++ b/solr/solrj/src/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 @@ -16,6 +14,7 @@ package org.apache.solr.common.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common.cloud; import java.io.IOException; import java.lang.reflect.Field; diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/VMParamsAllAndReadonlyDigestZkACLProvider.java b/solr/solrj/src/java/org/apache/solr/common/cloud/VMParamsAllAndReadonlyDigestZkACLProvider.java index 0b9ae1db41b..f6f491bed4f 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/VMParamsAllAndReadonlyDigestZkACLProvider.java +++ b/solr/solrj/src/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 @@ -26,6 +14,17 @@ import org.apache.zookeeper.server.auth.DigestAuthenticationProvider; * See the License for the specific language governing permissions and * 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 { diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/VMParamsSingleSetCredentialsDigestZkCredentialsProvider.java b/solr/solrj/src/java/org/apache/solr/common/cloud/VMParamsSingleSetCredentialsDigestZkCredentialsProvider.java index 1e575fdb20d..4316f3c4dd4 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/VMParamsSingleSetCredentialsDigestZkCredentialsProvider.java +++ b/solr/solrj/src/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 @@ -23,6 +14,14 @@ import org.apache.solr.common.StringUtils; * See the License for the specific language governing permissions and * 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 { diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkACLProvider.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkACLProvider.java index 03149b3d4ba..47ffa55a171 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkACLProvider.java +++ b/solr/solrj/src/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 @@ -20,6 +14,11 @@ import org.apache.zookeeper.data.ACL; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common.cloud; + +import java.util.List; + +import org.apache.zookeeper.data.ACL; public interface ZkACLProvider { diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkClientConnectionStrategy.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkClientConnectionStrategy.java index e5258c9ec62..43a2c521055 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkClientConnectionStrategy.java +++ b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkClientConnectionStrategy.java @@ -1,21 +1,20 @@ -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 - * 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 - * + * 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. + * 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.common.cloud; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCmdExecutor.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCmdExecutor.java index f9802085268..a32743c4fd9 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCmdExecutor.java +++ b/solr/solrj/src/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 @@ -16,6 +14,7 @@ package org.apache.solr.common.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common.cloud; import org.apache.zookeeper.CreateMode; import org.apache.zookeeper.KeeperException; diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkConfigManager.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkConfigManager.java index 6647a2ec542..9123c539198 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkConfigManager.java +++ b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkConfigManager.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.cloud; import org.apache.zookeeper.KeeperException; diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCoreNodeProps.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCoreNodeProps.java index 131d33025c7..42bcd1864b9 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCoreNodeProps.java +++ b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCoreNodeProps.java @@ -1,21 +1,20 @@ -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 - * 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 - * + * 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. + * 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.common.cloud; public class ZkCoreNodeProps { private ZkNodeProps nodeProps; diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCredentialsProvider.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCredentialsProvider.java index 129293592ff..112001bbde8 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkCredentialsProvider.java +++ b/solr/solrj/src/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 @@ -18,6 +14,9 @@ import java.util.Collection; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common.cloud; + +import java.util.Collection; public interface ZkCredentialsProvider { diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkNodeProps.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkNodeProps.java index 901b340dd9b..320ad132583 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkNodeProps.java +++ b/solr/solrj/src/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 @@ -16,6 +14,7 @@ package org.apache.solr.common.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common.cloud; import org.apache.solr.common.util.Utils; import org.noggit.JSONUtil; diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkOperation.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkOperation.java index b4da540ac77..e1db89910d2 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkOperation.java +++ b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkOperation.java @@ -1,5 +1,4 @@ /* - * * 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. @@ -7,7 +6,7 @@ * (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 + * 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, @@ -17,13 +16,10 @@ */ package org.apache.solr.common.cloud; -import java.io.IOException; - import org.apache.zookeeper.KeeperException; /** * A callback object which can be used for implementing retry-able operations. - * */ public abstract class ZkOperation { diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java index 5ca2da3e597..bfe89e35224 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java +++ b/solr/solrj/src/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 @@ -10,12 +8,13 @@ package org.apache.solr.common.cloud; * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required byOCP applicable law or agreed to in writing, software + * 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.common.cloud; import java.io.Closeable; import java.io.UnsupportedEncodingException; diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ZooKeeperException.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ZooKeeperException.java index c712deafa2d..144e7c939b8 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/ZooKeeperException.java +++ b/solr/solrj/src/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 @@ -16,7 +14,7 @@ package org.apache.solr.common.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.common.cloud; import org.apache.solr.common.SolrException; diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/package-info.java b/solr/solrj/src/java/org/apache/solr/common/cloud/package-info.java index 04ef67c60dd..3ec3585b007 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/package-info.java +++ b/solr/solrj/src/java/org/apache/solr/common/cloud/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Common Solr Cloud and ZooKeeper related classes reused on both clients & server. */ diff --git a/solr/solrj/src/java/org/apache/solr/common/luke/FieldFlag.java b/solr/solrj/src/java/org/apache/solr/common/luke/FieldFlag.java index bb3b417b45f..e79fb4ca01d 100644 --- a/solr/solrj/src/java/org/apache/solr/common/luke/FieldFlag.java +++ b/solr/solrj/src/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 @@ -15,8 +14,7 @@ package org.apache.solr.common.luke; * See the License for the specific language governing permissions and * limitations under the License. */ - - +package org.apache.solr.common.luke; /** * * @since solr 1.3 diff --git a/solr/solrj/src/java/org/apache/solr/common/luke/package-info.java b/solr/solrj/src/java/org/apache/solr/common/luke/package-info.java index e710d39bc8a..7603d064a68 100644 --- a/solr/solrj/src/java/org/apache/solr/common/luke/package-info.java +++ b/solr/solrj/src/java/org/apache/solr/common/luke/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Common constants used by the LukeRequestHandler. */ diff --git a/solr/solrj/src/java/org/apache/solr/common/package-info.java b/solr/solrj/src/java/org/apache/solr/common/package-info.java index 690a83c257d..b69f377b0a2 100644 --- a/solr/solrj/src/java/org/apache/solr/common/package-info.java +++ b/solr/solrj/src/java/org/apache/solr/common/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Common classes reused on both clients & server for dealing with {@link org.apache.solr.common.SolrInputDocument documents to be indexed} and {@link org.apache.solr.common.SolrDocumentList result documents}. */ diff --git a/solr/solrj/src/java/org/apache/solr/common/params/AnalysisParams.java b/solr/solrj/src/java/org/apache/solr/common/params/AnalysisParams.java index 36c276f2bc2..95a3bdcaae8 100644 --- a/solr/solrj/src/java/org/apache/solr/common/params/AnalysisParams.java +++ b/solr/solrj/src/java/org/apache/solr/common/params/AnalysisParams.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.params; /** diff --git a/solr/solrj/src/java/org/apache/solr/common/params/AppendedSolrParams.java b/solr/solrj/src/java/org/apache/solr/common/params/AppendedSolrParams.java index 4c9cc2e44e4..c309032f48e 100644 --- a/solr/solrj/src/java/org/apache/solr/common/params/AppendedSolrParams.java +++ b/solr/solrj/src/java/org/apache/solr/common/params/AppendedSolrParams.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.params; /** diff --git a/solr/solrj/src/java/org/apache/solr/common/params/CollectionParams.java b/solr/solrj/src/java/org/apache/solr/common/params/CollectionParams.java index cb93ba831aa..06559b0816e 100644 --- a/solr/solrj/src/java/org/apache/solr/common/params/CollectionParams.java +++ b/solr/solrj/src/java/org/apache/solr/common/params/CollectionParams.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 @@ -16,6 +14,7 @@ package org.apache.solr.common.params; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common.params; import java.util.Locale; diff --git a/solr/solrj/src/java/org/apache/solr/common/params/CommonAdminParams.java b/solr/solrj/src/java/org/apache/solr/common/params/CommonAdminParams.java index f6a646518f1..89895f63edb 100644 --- a/solr/solrj/src/java/org/apache/solr/common/params/CommonAdminParams.java +++ b/solr/solrj/src/java/org/apache/solr/common/params/CommonAdminParams.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.params; public interface CommonAdminParams diff --git a/solr/solrj/src/java/org/apache/solr/common/params/CommonParams.java b/solr/solrj/src/java/org/apache/solr/common/params/CommonParams.java index b3a563fceba..542932820b5 100644 --- a/solr/solrj/src/java/org/apache/solr/common/params/CommonParams.java +++ b/solr/solrj/src/java/org/apache/solr/common/params/CommonParams.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.params; import java.util.Locale; diff --git a/solr/solrj/src/java/org/apache/solr/common/params/ConfigSetParams.java b/solr/solrj/src/java/org/apache/solr/common/params/ConfigSetParams.java index 858e896319a..49c39ec59ac 100644 --- a/solr/solrj/src/java/org/apache/solr/common/params/ConfigSetParams.java +++ b/solr/solrj/src/java/org/apache/solr/common/params/ConfigSetParams.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 @@ -16,6 +14,7 @@ package org.apache.solr.common.params; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common.params; import java.util.Locale; diff --git a/solr/solrj/src/java/org/apache/solr/common/params/CoreAdminParams.java b/solr/solrj/src/java/org/apache/solr/common/params/CoreAdminParams.java index 0183554fd9e..0a9e749fe8e 100644 --- a/solr/solrj/src/java/org/apache/solr/common/params/CoreAdminParams.java +++ b/solr/solrj/src/java/org/apache/solr/common/params/CoreAdminParams.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.params; import java.util.Locale; diff --git a/solr/solrj/src/java/org/apache/solr/common/params/CursorMarkParams.java b/solr/solrj/src/java/org/apache/solr/common/params/CursorMarkParams.java index c20cfd956d9..8b9a7b9741c 100644 --- a/solr/solrj/src/java/org/apache/solr/common/params/CursorMarkParams.java +++ b/solr/solrj/src/java/org/apache/solr/common/params/CursorMarkParams.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.params; /** diff --git a/solr/solrj/src/java/org/apache/solr/common/params/DefaultSolrParams.java b/solr/solrj/src/java/org/apache/solr/common/params/DefaultSolrParams.java index 1f308cdc9f8..c8bc3b0759d 100644 --- a/solr/solrj/src/java/org/apache/solr/common/params/DefaultSolrParams.java +++ b/solr/solrj/src/java/org/apache/solr/common/params/DefaultSolrParams.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.params; import java.util.Iterator; diff --git a/solr/solrj/src/java/org/apache/solr/common/params/DisMaxParams.java b/solr/solrj/src/java/org/apache/solr/common/params/DisMaxParams.java index 6440e8781ec..c52b084bf75 100644 --- a/solr/solrj/src/java/org/apache/solr/common/params/DisMaxParams.java +++ b/solr/solrj/src/java/org/apache/solr/common/params/DisMaxParams.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.params; diff --git a/solr/solrj/src/java/org/apache/solr/common/params/EventParams.java b/solr/solrj/src/java/org/apache/solr/common/params/EventParams.java index f5d43c010a7..e4f35bca739 100644 --- a/solr/solrj/src/java/org/apache/solr/common/params/EventParams.java +++ b/solr/solrj/src/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 @@ -15,8 +14,7 @@ package org.apache.solr.common.params; * See the License for the specific language governing permissions and * limitations under the License. */ - - +package org.apache.solr.common.params; /** * * diff --git a/solr/solrj/src/java/org/apache/solr/common/params/ExpandParams.java b/solr/solrj/src/java/org/apache/solr/common/params/ExpandParams.java index a8f0cf7dc03..e5476fbf925 100644 --- a/solr/solrj/src/java/org/apache/solr/common/params/ExpandParams.java +++ b/solr/solrj/src/java/org/apache/solr/common/params/ExpandParams.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.params; /** diff --git a/solr/solrj/src/java/org/apache/solr/common/params/FacetParams.java b/solr/solrj/src/java/org/apache/solr/common/params/FacetParams.java index ed5f4ddf0c1..cd20923ba58 100644 --- a/solr/solrj/src/java/org/apache/solr/common/params/FacetParams.java +++ b/solr/solrj/src/java/org/apache/solr/common/params/FacetParams.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.params; import java.util.EnumSet; diff --git a/solr/solrj/src/java/org/apache/solr/common/params/GroupParams.java b/solr/solrj/src/java/org/apache/solr/common/params/GroupParams.java index ca8e2c4169f..3bfc5989138 100644 --- a/solr/solrj/src/java/org/apache/solr/common/params/GroupParams.java +++ b/solr/solrj/src/java/org/apache/solr/common/params/GroupParams.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.params; /** diff --git a/solr/solrj/src/java/org/apache/solr/common/params/HighlightParams.java b/solr/solrj/src/java/org/apache/solr/common/params/HighlightParams.java index ceccd74a7d9..21528a94caa 100644 --- a/solr/solrj/src/java/org/apache/solr/common/params/HighlightParams.java +++ b/solr/solrj/src/java/org/apache/solr/common/params/HighlightParams.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.params; /** diff --git a/solr/solrj/src/java/org/apache/solr/common/params/MapSolrParams.java b/solr/solrj/src/java/org/apache/solr/common/params/MapSolrParams.java index 5977e64a0ee..5454fcac277 100644 --- a/solr/solrj/src/java/org/apache/solr/common/params/MapSolrParams.java +++ b/solr/solrj/src/java/org/apache/solr/common/params/MapSolrParams.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.params; import java.util.Iterator; diff --git a/solr/solrj/src/java/org/apache/solr/common/params/ModifiableSolrParams.java b/solr/solrj/src/java/org/apache/solr/common/params/ModifiableSolrParams.java index ed27873d453..e3cb499680f 100644 --- a/solr/solrj/src/java/org/apache/solr/common/params/ModifiableSolrParams.java +++ b/solr/solrj/src/java/org/apache/solr/common/params/ModifiableSolrParams.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.params; import java.util.LinkedHashMap; diff --git a/solr/solrj/src/java/org/apache/solr/common/params/MoreLikeThisParams.java b/solr/solrj/src/java/org/apache/solr/common/params/MoreLikeThisParams.java index 0d808c2503f..b41cbfdddda 100644 --- a/solr/solrj/src/java/org/apache/solr/common/params/MoreLikeThisParams.java +++ b/solr/solrj/src/java/org/apache/solr/common/params/MoreLikeThisParams.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.params; import java.util.Locale; diff --git a/solr/solrj/src/java/org/apache/solr/common/params/MultiMapSolrParams.java b/solr/solrj/src/java/org/apache/solr/common/params/MultiMapSolrParams.java index 8ebbf1a8c66..ed6a2e7cf21 100644 --- a/solr/solrj/src/java/org/apache/solr/common/params/MultiMapSolrParams.java +++ b/solr/solrj/src/java/org/apache/solr/common/params/MultiMapSolrParams.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.params; import java.util.HashMap; diff --git a/solr/solrj/src/java/org/apache/solr/common/params/QueryElevationParams.java b/solr/solrj/src/java/org/apache/solr/common/params/QueryElevationParams.java index d5a0b41582e..794bbed8e10 100644 --- a/solr/solrj/src/java/org/apache/solr/common/params/QueryElevationParams.java +++ b/solr/solrj/src/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 @@ -16,7 +14,7 @@ package org.apache.solr.common.params; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.common.params; /** * Parameters used with the QueryElevationComponent diff --git a/solr/solrj/src/java/org/apache/solr/common/params/RequiredSolrParams.java b/solr/solrj/src/java/org/apache/solr/common/params/RequiredSolrParams.java index 0b78d41c217..d6fcbfc31aa 100644 --- a/solr/solrj/src/java/org/apache/solr/common/params/RequiredSolrParams.java +++ b/solr/solrj/src/java/org/apache/solr/common/params/RequiredSolrParams.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.params; import org.apache.solr.common.SolrException; diff --git a/solr/solrj/src/java/org/apache/solr/common/params/ShardParams.java b/solr/solrj/src/java/org/apache/solr/common/params/ShardParams.java index 28f2baa0c27..26865737a92 100644 --- a/solr/solrj/src/java/org/apache/solr/common/params/ShardParams.java +++ b/solr/solrj/src/java/org/apache/solr/common/params/ShardParams.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.params; /** diff --git a/solr/solrj/src/java/org/apache/solr/common/params/SimpleParams.java b/solr/solrj/src/java/org/apache/solr/common/params/SimpleParams.java index e7704027b5e..b42db085cd5 100644 --- a/solr/solrj/src/java/org/apache/solr/common/params/SimpleParams.java +++ b/solr/solrj/src/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 @@ -16,6 +14,7 @@ package org.apache.solr.common.params; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common.params; /** * Parameters used by the SimpleQParser. diff --git a/solr/solrj/src/java/org/apache/solr/common/params/SolrParams.java b/solr/solrj/src/java/org/apache/solr/common/params/SolrParams.java index 0c057281fec..090fdb85e23 100644 --- a/solr/solrj/src/java/org/apache/solr/common/params/SolrParams.java +++ b/solr/solrj/src/java/org/apache/solr/common/params/SolrParams.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.params; import org.apache.solr.common.SolrException; diff --git a/solr/solrj/src/java/org/apache/solr/common/params/SpatialParams.java b/solr/solrj/src/java/org/apache/solr/common/params/SpatialParams.java index 043f2163225..12d2ea6bdb7 100644 --- a/solr/solrj/src/java/org/apache/solr/common/params/SpatialParams.java +++ b/solr/solrj/src/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 @@ -15,8 +14,7 @@ package org.apache.solr.common.params; * See the License for the specific language governing permissions and * limitations under the License. */ - - +package org.apache.solr.common.params; /** * * diff --git a/solr/solrj/src/java/org/apache/solr/common/params/SpellingParams.java b/solr/solrj/src/java/org/apache/solr/common/params/SpellingParams.java index def80221a25..eeeb7159764 100644 --- a/solr/solrj/src/java/org/apache/solr/common/params/SpellingParams.java +++ b/solr/solrj/src/java/org/apache/solr/common/params/SpellingParams.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.params; /** diff --git a/solr/solrj/src/java/org/apache/solr/common/params/StatsParams.java b/solr/solrj/src/java/org/apache/solr/common/params/StatsParams.java index 6fb7935c7f7..98cf7cbec7b 100644 --- a/solr/solrj/src/java/org/apache/solr/common/params/StatsParams.java +++ b/solr/solrj/src/java/org/apache/solr/common/params/StatsParams.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.params; /** diff --git a/solr/solrj/src/java/org/apache/solr/common/params/TermVectorParams.java b/solr/solrj/src/java/org/apache/solr/common/params/TermVectorParams.java index a896f1beb46..2caecdee6e5 100644 --- a/solr/solrj/src/java/org/apache/solr/common/params/TermVectorParams.java +++ b/solr/solrj/src/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 @@ -15,8 +14,7 @@ package org.apache.solr.common.params; * See the License for the specific language governing permissions and * limitations under the License. */ - - +package org.apache.solr.common.params; /** * * diff --git a/solr/solrj/src/java/org/apache/solr/common/params/TermsParams.java b/solr/solrj/src/java/org/apache/solr/common/params/TermsParams.java index ffb196f7937..ff1be5f8d65 100644 --- a/solr/solrj/src/java/org/apache/solr/common/params/TermsParams.java +++ b/solr/solrj/src/java/org/apache/solr/common/params/TermsParams.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.params; import java.util.regex.Pattern; diff --git a/solr/solrj/src/java/org/apache/solr/common/params/UpdateParams.java b/solr/solrj/src/java/org/apache/solr/common/params/UpdateParams.java index cf965a91df1..dd35fd5701c 100644 --- a/solr/solrj/src/java/org/apache/solr/common/params/UpdateParams.java +++ b/solr/solrj/src/java/org/apache/solr/common/params/UpdateParams.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.params; /** diff --git a/solr/solrj/src/java/org/apache/solr/common/params/package-info.java b/solr/solrj/src/java/org/apache/solr/common/params/package-info.java index 94622cc74fc..43558e6cd71 100644 --- a/solr/solrj/src/java/org/apache/solr/common/params/package-info.java +++ b/solr/solrj/src/java/org/apache/solr/common/params/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Parameter constants and enumerations. */ diff --git a/solr/solrj/src/java/org/apache/solr/common/util/ByteUtils.java b/solr/solrj/src/java/org/apache/solr/common/util/ByteUtils.java index f4fc4e680f8..cb17ad7947b 100644 --- a/solr/solrj/src/java/org/apache/solr/common/util/ByteUtils.java +++ b/solr/solrj/src/java/org/apache/solr/common/util/ByteUtils.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.util; import java.io.IOException; diff --git a/solr/solrj/src/java/org/apache/solr/common/util/Cache.java b/solr/solrj/src/java/org/apache/solr/common/util/Cache.java index 6c993b20b10..7be7f0cc700 100644 --- a/solr/solrj/src/java/org/apache/solr/common/util/Cache.java +++ b/solr/solrj/src/java/org/apache/solr/common/util/Cache.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 @@ -16,6 +14,7 @@ package org.apache.solr.common.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common.util; public interface Cache { public V put(K key, V val); diff --git a/solr/solrj/src/java/org/apache/solr/common/util/ContentStream.java b/solr/solrj/src/java/org/apache/solr/common/util/ContentStream.java index b455d8087d9..b7e74da701e 100644 --- a/solr/solrj/src/java/org/apache/solr/common/util/ContentStream.java +++ b/solr/solrj/src/java/org/apache/solr/common/util/ContentStream.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.util; import java.io.IOException; diff --git a/solr/solrj/src/java/org/apache/solr/common/util/ContentStreamBase.java b/solr/solrj/src/java/org/apache/solr/common/util/ContentStreamBase.java index b70fed5850d..bd1d63bb95a 100644 --- a/solr/solrj/src/java/org/apache/solr/common/util/ContentStreamBase.java +++ b/solr/solrj/src/java/org/apache/solr/common/util/ContentStreamBase.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.util; import java.io.ByteArrayInputStream; diff --git a/solr/solrj/src/java/org/apache/solr/common/util/DataInputInputStream.java b/solr/solrj/src/java/org/apache/solr/common/util/DataInputInputStream.java index d412f40b5e7..b8a07be761a 100644 --- a/solr/solrj/src/java/org/apache/solr/common/util/DataInputInputStream.java +++ b/solr/solrj/src/java/org/apache/solr/common/util/DataInputInputStream.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.util; import java.io.DataInput; diff --git a/solr/solrj/src/java/org/apache/solr/common/util/DateUtil.java b/solr/solrj/src/java/org/apache/solr/common/util/DateUtil.java index da4cd15a717..9bf7a2ba11e 100644 --- a/solr/solrj/src/java/org/apache/solr/common/util/DateUtil.java +++ b/solr/solrj/src/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 @@ -15,7 +14,7 @@ package org.apache.solr.common.util; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.common.util; import java.io.IOException; import java.text.DateFormat; import java.text.ParseException; diff --git a/solr/solrj/src/java/org/apache/solr/common/util/ExecutorUtil.java b/solr/solrj/src/java/org/apache/solr/common/util/ExecutorUtil.java index f3cdfbd5dbd..5f663849659 100644 --- a/solr/solrj/src/java/org/apache/solr/common/util/ExecutorUtil.java +++ b/solr/solrj/src/java/org/apache/solr/common/util/ExecutorUtil.java @@ -1,9 +1,3 @@ -package org.apache.solr.common.util; - -import java.lang.invoke.MethodHandles; -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 +14,11 @@ import java.util.Collection; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common.util; + +import java.lang.invoke.MethodHandles; +import java.util.ArrayList; +import java.util.Collection; import java.util.Enumeration; import java.util.HashMap; diff --git a/solr/solrj/src/java/org/apache/solr/common/util/FastInputStream.java b/solr/solrj/src/java/org/apache/solr/common/util/FastInputStream.java index 96a76d88a0d..06d07380f29 100644 --- a/solr/solrj/src/java/org/apache/solr/common/util/FastInputStream.java +++ b/solr/solrj/src/java/org/apache/solr/common/util/FastInputStream.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.util; import java.io.*; diff --git a/solr/solrj/src/java/org/apache/solr/common/util/FastOutputStream.java b/solr/solrj/src/java/org/apache/solr/common/util/FastOutputStream.java index 09a74417463..82ccd8d5ee0 100644 --- a/solr/solrj/src/java/org/apache/solr/common/util/FastOutputStream.java +++ b/solr/solrj/src/java/org/apache/solr/common/util/FastOutputStream.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.util; import java.io.*; diff --git a/solr/solrj/src/java/org/apache/solr/common/util/Hash.java b/solr/solrj/src/java/org/apache/solr/common/util/Hash.java index 3af849a5b4c..6a7a8d76fc0 100644 --- a/solr/solrj/src/java/org/apache/solr/common/util/Hash.java +++ b/solr/solrj/src/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 @@ -16,6 +14,7 @@ package org.apache.solr.common.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common.util; /** *

    Fast, well distributed, cross-platform hash functions. diff --git a/solr/solrj/src/java/org/apache/solr/common/util/IOUtils.java b/solr/solrj/src/java/org/apache/solr/common/util/IOUtils.java index 0092472a89e..3e9efa516e9 100644 --- a/solr/solrj/src/java/org/apache/solr/common/util/IOUtils.java +++ b/solr/solrj/src/java/org/apache/solr/common/util/IOUtils.java @@ -1,11 +1,3 @@ -package org.apache.solr.common.util; - -import java.io.Closeable; -import java.lang.invoke.MethodHandles; - -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 +14,13 @@ import org.slf4j.LoggerFactory; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common.util; + +import java.io.Closeable; +import java.lang.invoke.MethodHandles; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class IOUtils { private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); diff --git a/solr/solrj/src/java/org/apache/solr/common/util/IteratorChain.java b/solr/solrj/src/java/org/apache/solr/common/util/IteratorChain.java index 8a0bb1df2b1..9e47c873cb9 100644 --- a/solr/solrj/src/java/org/apache/solr/common/util/IteratorChain.java +++ b/solr/solrj/src/java/org/apache/solr/common/util/IteratorChain.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.util; import java.util.ArrayList; diff --git a/solr/solrj/src/java/org/apache/solr/common/util/NamedList.java b/solr/solrj/src/java/org/apache/solr/common/util/NamedList.java index 4eaff7083d7..3ca750d4c3f 100644 --- a/solr/solrj/src/java/org/apache/solr/common/util/NamedList.java +++ b/solr/solrj/src/java/org/apache/solr/common/util/NamedList.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.util; import java.io.Serializable; diff --git a/solr/solrj/src/java/org/apache/solr/common/util/ObjectReleaseTracker.java b/solr/solrj/src/java/org/apache/solr/common/util/ObjectReleaseTracker.java index f3f0ab64473..3fc0546e820 100644 --- a/solr/solrj/src/java/org/apache/solr/common/util/ObjectReleaseTracker.java +++ b/solr/solrj/src/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 @@ -16,6 +14,7 @@ package org.apache.solr.common.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common.util; import java.io.Closeable; diff --git a/solr/solrj/src/java/org/apache/solr/common/util/Pair.java b/solr/solrj/src/java/org/apache/solr/common/util/Pair.java index 390bc02711e..423f94c511c 100644 --- a/solr/solrj/src/java/org/apache/solr/common/util/Pair.java +++ b/solr/solrj/src/java/org/apache/solr/common/util/Pair.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 @@ -16,6 +14,7 @@ package org.apache.solr.common.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common.util; import java.io.Serializable; diff --git a/solr/solrj/src/java/org/apache/solr/common/util/RetryUtil.java b/solr/solrj/src/java/org/apache/solr/common/util/RetryUtil.java index 132e89df957..8745a54f350 100644 --- a/solr/solrj/src/java/org/apache/solr/common/util/RetryUtil.java +++ b/solr/solrj/src/java/org/apache/solr/common/util/RetryUtil.java @@ -1,9 +1,3 @@ -package org.apache.solr.common.util; - -import java.lang.invoke.MethodHandles; -import java.util.Collections; -import java.util.Set; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -20,6 +14,11 @@ import java.util.Set; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common.util; + +import java.lang.invoke.MethodHandles; +import java.util.Collections; +import java.util.Set; import java.util.concurrent.TimeUnit; diff --git a/solr/solrj/src/java/org/apache/solr/common/util/SimpleOrderedMap.java b/solr/solrj/src/java/org/apache/solr/common/util/SimpleOrderedMap.java index c53fca0d5e0..3fee6dac802 100644 --- a/solr/solrj/src/java/org/apache/solr/common/util/SimpleOrderedMap.java +++ b/solr/solrj/src/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 @@ -16,6 +14,7 @@ package org.apache.solr.common.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common.util; import java.util.*; diff --git a/solr/solrj/src/java/org/apache/solr/common/util/SolrjNamedThreadFactory.java b/solr/solrj/src/java/org/apache/solr/common/util/SolrjNamedThreadFactory.java index 2a7c901d377..0bc8b7d8369 100644 --- a/solr/solrj/src/java/org/apache/solr/common/util/SolrjNamedThreadFactory.java +++ b/solr/solrj/src/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 @@ -19,6 +14,10 @@ import java.util.concurrent.atomic.AtomicInteger; * See the License for the specific language governing permissions and * 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); diff --git a/solr/solrj/src/java/org/apache/solr/common/util/StrUtils.java b/solr/solrj/src/java/org/apache/solr/common/util/StrUtils.java index 2f33bc1c90d..efe54cf11c7 100644 --- a/solr/solrj/src/java/org/apache/solr/common/util/StrUtils.java +++ b/solr/solrj/src/java/org/apache/solr/common/util/StrUtils.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.util; import java.text.MessageFormat; diff --git a/solr/solrj/src/java/org/apache/solr/common/util/SuppressForbidden.java b/solr/solrj/src/java/org/apache/solr/common/util/SuppressForbidden.java index d388c29a8ad..b30df0530f8 100644 --- a/solr/solrj/src/java/org/apache/solr/common/util/SuppressForbidden.java +++ b/solr/solrj/src/java/org/apache/solr/common/util/SuppressForbidden.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 @@ -16,6 +14,7 @@ package org.apache.solr.common.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common.util; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/solr/solrj/src/java/org/apache/solr/common/util/URLUtil.java b/solr/solrj/src/java/org/apache/solr/common/util/URLUtil.java index 6d273ecdffe..dc00853f830 100644 --- a/solr/solrj/src/java/org/apache/solr/common/util/URLUtil.java +++ b/solr/solrj/src/java/org/apache/solr/common/util/URLUtil.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.util; import java.util.regex.Matcher; diff --git a/solr/solrj/src/java/org/apache/solr/common/util/Utils.java b/solr/solrj/src/java/org/apache/solr/common/util/Utils.java index 8e656ba6606..c807dbefcc4 100644 --- a/solr/solrj/src/java/org/apache/solr/common/util/Utils.java +++ b/solr/solrj/src/java/org/apache/solr/common/util/Utils.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 @@ -16,7 +14,7 @@ package org.apache.solr.common.util; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.common.util; import java.io.IOException; import java.io.StringReader; diff --git a/solr/solrj/src/java/org/apache/solr/common/util/XML.java b/solr/solrj/src/java/org/apache/solr/common/util/XML.java index 50a6da26788..c6e520523e8 100644 --- a/solr/solrj/src/java/org/apache/solr/common/util/XML.java +++ b/solr/solrj/src/java/org/apache/solr/common/util/XML.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.util; import java.io.Writer; diff --git a/solr/solrj/src/java/org/apache/solr/common/util/XMLErrorLogger.java b/solr/solrj/src/java/org/apache/solr/common/util/XMLErrorLogger.java index 7f45ff974ba..2bcfbd46135 100644 --- a/solr/solrj/src/java/org/apache/solr/common/util/XMLErrorLogger.java +++ b/solr/solrj/src/java/org/apache/solr/common/util/XMLErrorLogger.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.util; import org.slf4j.Logger; diff --git a/solr/solrj/src/java/org/apache/solr/common/util/package-info.java b/solr/solrj/src/java/org/apache/solr/common/util/package-info.java index 1da825fa9e5..116b6cebba9 100644 --- a/solr/solrj/src/java/org/apache/solr/common/util/package-info.java +++ b/solr/solrj/src/java/org/apache/solr/common/util/package-info.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Common utility classes reused on both clients & server. */ diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/CollectionAdminRequestRequiredParamsTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/CollectionAdminRequestRequiredParamsTest.java index 84c52f0d1fd..50f2d18a15f 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/CollectionAdminRequestRequiredParamsTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/CollectionAdminRequestRequiredParamsTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj; - /* * 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; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj; import static org.apache.solr.common.params.CoreAdminParams.*; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/GetByIdTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/GetByIdTest.java index f32e7ff33ad..5c493e3ef95 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/GetByIdTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/GetByIdTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj; - /* * 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; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj; import java.io.File; import java.util.Arrays; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java b/solr/solrj/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java index 25532a5e472..b9d525ce27e 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj; import org.apache.solr.SolrJettyTestBase; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java b/solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java index 450f1fc476b..9c633b1c29e 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj; import org.apache.solr.SolrTestCaseJ4; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryTest.java index 5f2ce723965..04807fe2e75 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleBinaryTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj; import org.apache.solr.SolrTestCaseJ4.SuppressSSL; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestBase.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestBase.java index 057e3b0b916..ce762a0120f 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestBase.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestBase.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj; import org.apache.solr.util.AbstractSolrTestCase; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java index 65551dd25ad..6547bc13791 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestsBase.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestsBase.java index 062942ad648..dc964cbe650 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestsBase.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTestsBase.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj; import junit.framework.Assert; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleXMLTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleXMLTest.java index a7611a327d6..f1b77e4e38d 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleXMLTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleXMLTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj; import org.apache.solr.SolrTestCaseJ4.SuppressSSL; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExceptionTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExceptionTest.java index 44234a4dde8..75a030d8fb7 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExceptionTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExceptionTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj; import org.apache.http.impl.client.CloseableHttpClient; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrQueryTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrQueryTest.java index 7b5be047a83..43fdff4d095 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrQueryTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrQueryTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj; import org.apache.lucene.util.LuceneTestCase; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrSchemalessExampleTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrSchemalessExampleTest.java index 21a71166fff..dbef180a68e 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrSchemalessExampleTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrSchemalessExampleTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj; import org.apache.commons.io.FileUtils; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/StartSolrJetty.java b/solr/solrj/src/test/org/apache/solr/client/solrj/StartSolrJetty.java index 3c0b92319c6..c231cc3173e 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/StartSolrJetty.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/StartSolrJetty.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj; import org.eclipse.jetty.server.Connector; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java index b782ca8d710..5bebd644617 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/TestLBHttpSolrClient.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj; import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/TestSolrJErrorHandling.java b/solr/solrj/src/test/org/apache/solr/client/solrj/TestSolrJErrorHandling.java index 28a06aefeb8..a9c7fb1ff77 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/TestSolrJErrorHandling.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/TestSolrJErrorHandling.java @@ -1,7 +1,3 @@ -package org.apache.solr.client.solrj; - -import java.io.BufferedOutputStream; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import java.io.BufferedOutputStream; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj; + +import java.io.BufferedOutputStream; import java.io.IOException; import java.io.InputStream; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/AbstractEmbeddedSolrServerTestCase.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/AbstractEmbeddedSolrServerTestCase.java index 0780b323fb8..117ec1d2765 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/AbstractEmbeddedSolrServerTestCase.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/AbstractEmbeddedSolrServerTestCase.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.embedded; - /* * 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.embedded; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.embedded; import java.io.File; import java.nio.file.Path; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java index 691c350692e..fa22f80dcd2 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/JettyWebappTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.embedded; import java.io.File; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeEmbeddedTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeEmbeddedTest.java index 0814b370473..f26f0c2dcd1 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeEmbeddedTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeEmbeddedTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.embedded; import org.apache.solr.client.solrj.LargeVolumeTestBase; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeJettyTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeJettyTest.java index 0f313f30c38..7b5459fa5de 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeJettyTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeJettyTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.embedded; import org.apache.solr.client.solrj.LargeVolumeTestBase; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/MergeIndexesEmbeddedTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/MergeIndexesEmbeddedTest.java index 026bbec26f3..6a1ab9bd516 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/MergeIndexesEmbeddedTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/MergeIndexesEmbeddedTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.embedded; import org.apache.solr.client.solrj.MergeIndexesExampleTestBase; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleEmbeddedTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleEmbeddedTest.java index 6a24d0d907c..7ce5aa032ea 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleEmbeddedTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleEmbeddedTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.embedded; import org.apache.solr.client.solrj.SolrExampleTests; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java index 3256425cbe6..035619698eb 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.embedded; import org.apache.http.HttpResponse; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryTest.java index 97e090dbf42..14280543061 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.embedded; - /* * 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.embedded; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.embedded; import org.apache.solr.SolrTestCaseJ4.SuppressSSL; import org.apache.lucene.util.LuceneTestCase.Slow; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java index 76964808acb..c3fa7846e61 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.embedded; import org.apache.lucene.util.LuceneTestCase.Slow; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServer.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServer.java index f9397955574..32144886831 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServer.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestEmbeddedSolrServer.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.embedded; - /* * 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.embedded; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.embedded; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java index 49c51e2dcf4..5f89c870013 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.embedded; import com.carrotsearch.randomizedtesting.rules.SystemPropertiesRestoreRule; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java index fad031cebf5..2c7ac9d9652 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrClientTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.impl; import javax.servlet.ServletException; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientMultiConstructorTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientMultiConstructorTest.java index 6b0ea23e1ee..3a132d7a171 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientMultiConstructorTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientMultiConstructorTest.java @@ -1,14 +1,3 @@ -package org.apache.solr.client.solrj.impl; - -import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.TestUtil; -import org.junit.Test; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.LinkedHashSet; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -25,6 +14,16 @@ import java.util.LinkedHashSet; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.impl; + +import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.util.TestUtil; +import org.junit.Test; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.LinkedHashSet; public class CloudSolrClientMultiConstructorTest extends LuceneTestCase { diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java index ce9eb976890..77d8d0fff3b 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.client.solrj.impl; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.impl; import com.google.common.collect.Lists; import com.google.common.collect.Maps; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientTest.java index bee0361556b..bd5e6a25be2 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ConcurrentUpdateSolrClientTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.impl; import org.apache.http.HttpResponse; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ExternalHttpClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ExternalHttpClientTest.java index 01187a143c4..c788ae396ed 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ExternalHttpClientTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/ExternalHttpClientTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.client.solrj.impl; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.impl; import org.apache.http.client.config.RequestConfig; import org.apache.http.impl.client.CloseableHttpClient; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientTest.java index 386c7b42b28..dba18d07732 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/LBHttpSolrClientTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.impl; import org.apache.http.impl.client.CloseableHttpClient; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/SolrPortAwareCookieSpecTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/SolrPortAwareCookieSpecTest.java index dbdee6671d5..b5f08d69a6f 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/SolrPortAwareCookieSpecTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/SolrPortAwareCookieSpecTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.client.solrj.impl; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.impl; import org.apache.http.cookie.CookieAttributeHandler; import org.apache.http.cookie.CookieOrigin; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/TestCloudSolrClientConnections.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/TestCloudSolrClientConnections.java index 8a089b945de..f3abc26d75b 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/TestCloudSolrClientConnections.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/TestCloudSolrClientConnections.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 @@ -16,6 +14,7 @@ package org.apache.solr.client.solrj.impl; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.impl; import java.nio.file.Path; import java.util.concurrent.TimeUnit; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcDriverTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcDriverTest.java index 215abff22a9..3b2d0895ef5 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcDriverTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcDriverTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.io.sql; - /* * 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.io.sql; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.io.sql; import java.net.URI; import java.sql.Connection; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java index b8922a4cda7..82ae02e776f 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.io.sql; - /* * 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.io.sql; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.io.sql; import java.io.File; import java.sql.Connection; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/JDBCStreamTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/JDBCStreamTest.java index 43ab7e3981b..f330c110a9e 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/JDBCStreamTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/JDBCStreamTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.io.stream; - /* * 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.io.stream; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.io.stream; import java.io.File; import java.io.IOException; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/RecordCountStream.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/RecordCountStream.java index 41450fd69a4..7a9c7c6fb56 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/RecordCountStream.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/RecordCountStream.java @@ -1,4 +1,3 @@ -package org.apache.solr.client.solrj.io.stream; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,6 +14,7 @@ package org.apache.solr.client.solrj.io.stream; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.io.stream; import java.io.IOException; import java.io.Serializable; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java index 33ee767ad30..6fa1a220fd7 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.io.stream; - /* * 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.io.stream; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.io.stream; import java.io.File; import java.io.IOException; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionToExpessionTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionToExpessionTest.java index bc98a7b5f1b..93f8a6ab1b9 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionToExpessionTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionToExpessionTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.io.stream; - /* * 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.io.stream; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.io.stream; import org.apache.lucene.util.LuceneTestCase; import org.apache.solr.client.solrj.io.ops.GroupOperation; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java index 726d3bf1f6b..cec2c525f61 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.io.stream; - /* * 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.io.stream; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.io.stream; import java.io.File; import java.io.IOException; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionParserTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionParserTest.java index 753ea1b2b7b..0fc2ca9d6ec 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionParserTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionParserTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.io.stream.expr; - /* * 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.io.stream.expr; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.io.stream.expr; import org.apache.lucene.util.LuceneTestCase; import org.apache.solr.client.solrj.io.stream.expr.StreamExpression; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/ops/ConcatOperationTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/ops/ConcatOperationTest.java index 749edccda07..838c4cdb0c7 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/ops/ConcatOperationTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/ops/ConcatOperationTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.io.stream.ops; - /* * 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.io.stream.ops; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.io.stream.ops; import java.util.Map; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/ops/OperationsTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/ops/OperationsTest.java index 48a83aec77b..60adfce9463 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/ops/OperationsTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/ops/OperationsTest.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.io.stream.ops; - /* * 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.io.stream.ops; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.io.stream.ops; import java.util.Map; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/SchemaTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/SchemaTest.java index 318e044718a..b723abf467d 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/SchemaTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/SchemaTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.client.solrj.request; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.request; import java.io.File; import java.util.ArrayList; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/SolrPingTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/SolrPingTest.java index 51784388fd2..e65049b8439 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/SolrPingTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/SolrPingTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.client.solrj.request; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.request; import junit.framework.Assert; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestConfigSetAdminRequest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestConfigSetAdminRequest.java index 1d3e12d9d27..a3409bdd35b 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestConfigSetAdminRequest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestConfigSetAdminRequest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.request; import org.apache.solr.SolrTestCaseJ4; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java index 12d54403525..4e4637317fb 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestCoreAdmin.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.request; import java.io.File; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestUpdateRequest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestUpdateRequest.java index 1c755a579c5..dc8e965449f 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestUpdateRequest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestUpdateRequest.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 @@ -16,6 +14,7 @@ package org.apache.solr.client.solrj.request; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.client.solrj.request; import java.util.Arrays; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/response/AnlysisResponseBaseTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/response/AnlysisResponseBaseTest.java index 62bd947c2a2..228bf8268ca 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/response/AnlysisResponseBaseTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/response/AnlysisResponseBaseTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.response; import org.apache.lucene.util.LuceneTestCase; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/response/DocumentAnalysisResponseTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/response/DocumentAnalysisResponseTest.java index f07a14031db..2a60e94e9e9 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/response/DocumentAnalysisResponseTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/response/DocumentAnalysisResponseTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.response; import org.apache.lucene.util.LuceneTestCase; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/response/FacetFieldTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/response/FacetFieldTest.java index beaab3b2d3d..9207772698a 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/response/FacetFieldTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/response/FacetFieldTest.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 org.apache.lucene.util.LuceneTestCase; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/response/FieldAnalysisResponseTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/response/FieldAnalysisResponseTest.java index 59a154bcef0..ee9c532731b 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/response/FieldAnalysisResponseTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/response/FieldAnalysisResponseTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.response; import org.apache.lucene.util.LuceneTestCase; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/response/NoOpResponseParserTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/response/NoOpResponseParserTest.java index ea7552a48c4..f371323ba0f 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/response/NoOpResponseParserTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/response/NoOpResponseParserTest.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.IOException; import java.io.InputStream; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/response/QueryResponseTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/response/QueryResponseTest.java index d9840b07945..f3ba1bcce52 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/response/QueryResponseTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/response/QueryResponseTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.response; import java.io.InputStream; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/response/TermsResponseTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/response/TermsResponseTest.java index 7a86fc71bd3..681588949a3 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/response/TermsResponseTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/response/TermsResponseTest.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 @@ -15,7 +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.util.List; import junit.framework.Assert; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestClusteringResponse.java b/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestClusteringResponse.java index 454d4347875..5bc20e14c10 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestClusteringResponse.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestClusteringResponse.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 @@ -15,7 +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.InputStream; import java.io.InputStreamReader; import java.io.Reader; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestSpellCheckResponse.java b/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestSpellCheckResponse.java index e7780f6103b..443091b5849 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestSpellCheckResponse.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestSpellCheckResponse.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 @@ -15,7 +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 junit.framework.Assert; import org.apache.solr.SolrJettyTestBase; import org.apache.solr.client.solrj.SolrQuery; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestSuggesterResponse.java b/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestSuggesterResponse.java index c5cc0e0bed1..0b3cf2ce1bd 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestSuggesterResponse.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/response/TestSuggesterResponse.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 @@ -15,7 +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.IOException; import java.util.List; import java.util.Map; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/util/ClientUtilsTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/util/ClientUtilsTest.java index 335d7139878..6a2ca2627a2 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/util/ClientUtilsTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/util/ClientUtilsTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.client.solrj.util; import org.apache.lucene.util.LuceneTestCase; diff --git a/solr/solrj/src/test/org/apache/solr/common/SolrDocumentTest.java b/solr/solrj/src/test/org/apache/solr/common/SolrDocumentTest.java index 52fc832f55d..6b3318de300 100644 --- a/solr/solrj/src/test/org/apache/solr/common/SolrDocumentTest.java +++ b/solr/solrj/src/test/org/apache/solr/common/SolrDocumentTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common; import java.util.ArrayList; diff --git a/solr/solrj/src/test/org/apache/solr/common/cloud/SolrZkClientTest.java b/solr/solrj/src/test/org/apache/solr/common/cloud/SolrZkClientTest.java index b8bcd70fcf7..ab99cc008e1 100644 --- a/solr/solrj/src/test/org/apache/solr/common/cloud/SolrZkClientTest.java +++ b/solr/solrj/src/test/org/apache/solr/common/cloud/SolrZkClientTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.common.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common.cloud; import java.lang.invoke.MethodHandles; import java.nio.charset.StandardCharsets; diff --git a/solr/solrj/src/test/org/apache/solr/common/cloud/TestZkConfigManager.java b/solr/solrj/src/test/org/apache/solr/common/cloud/TestZkConfigManager.java index d86df716b5f..fd7a0acd0ba 100644 --- a/solr/solrj/src/test/org/apache/solr/common/cloud/TestZkConfigManager.java +++ b/solr/solrj/src/test/org/apache/solr/common/cloud/TestZkConfigManager.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.cloud; import com.google.common.base.Charsets; diff --git a/solr/solrj/src/test/org/apache/solr/common/params/CommonAdminParamsTest.java b/solr/solrj/src/test/org/apache/solr/common/params/CommonAdminParamsTest.java index 97e8704181d..3fc663776d2 100644 --- a/solr/solrj/src/test/org/apache/solr/common/params/CommonAdminParamsTest.java +++ b/solr/solrj/src/test/org/apache/solr/common/params/CommonAdminParamsTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.params; import org.apache.lucene.util.LuceneTestCase; diff --git a/solr/solrj/src/test/org/apache/solr/common/params/CommonParamsTest.java b/solr/solrj/src/test/org/apache/solr/common/params/CommonParamsTest.java index 70c389488cd..c79c797c6d9 100755 --- a/solr/solrj/src/test/org/apache/solr/common/params/CommonParamsTest.java +++ b/solr/solrj/src/test/org/apache/solr/common/params/CommonParamsTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.params; import org.apache.lucene.util.LuceneTestCase; diff --git a/solr/solrj/src/test/org/apache/solr/common/params/ModifiableSolrParamsTest.java b/solr/solrj/src/test/org/apache/solr/common/params/ModifiableSolrParamsTest.java index b8b66461905..b65b607576b 100644 --- a/solr/solrj/src/test/org/apache/solr/common/params/ModifiableSolrParamsTest.java +++ b/solr/solrj/src/test/org/apache/solr/common/params/ModifiableSolrParamsTest.java @@ -1,12 +1,18 @@ /* - * 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. + * 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.common.params; @@ -16,8 +22,7 @@ import org.apache.lucene.util.LuceneTestCase; * Unit Test Case for {@link org.apache.solr.common.params.ModifiableSolrParams * ModifiableSolrParams} */ -public class ModifiableSolrParamsTest extends LuceneTestCase -{ +public class ModifiableSolrParamsTest extends LuceneTestCase { @Override public void setUp() throws Exception diff --git a/solr/solrj/src/test/org/apache/solr/common/params/ShardParamsTest.java b/solr/solrj/src/test/org/apache/solr/common/params/ShardParamsTest.java index da6c25dd2f9..685fd6ac7cf 100644 --- a/solr/solrj/src/test/org/apache/solr/common/params/ShardParamsTest.java +++ b/solr/solrj/src/test/org/apache/solr/common/params/ShardParamsTest.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 @@ -16,6 +14,7 @@ package org.apache.solr.common.params; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common.params; import org.apache.lucene.util.LuceneTestCase; diff --git a/solr/solrj/src/test/org/apache/solr/common/params/SolrParamTest.java b/solr/solrj/src/test/org/apache/solr/common/params/SolrParamTest.java index 0176ea57ad8..ed6465f6d9b 100644 --- a/solr/solrj/src/test/org/apache/solr/common/params/SolrParamTest.java +++ b/solr/solrj/src/test/org/apache/solr/common/params/SolrParamTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.params; import java.util.Arrays; diff --git a/solr/solrj/src/test/org/apache/solr/common/util/ContentStreamTest.java b/solr/solrj/src/test/org/apache/solr/common/util/ContentStreamTest.java index 6bb86215301..8ecc29c90c8 100644 --- a/solr/solrj/src/test/org/apache/solr/common/util/ContentStreamTest.java +++ b/solr/solrj/src/test/org/apache/solr/common/util/ContentStreamTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.util; import java.io.File; diff --git a/solr/solrj/src/test/org/apache/solr/common/util/IteratorChainTest.java b/solr/solrj/src/test/org/apache/solr/common/util/IteratorChainTest.java index 99d73405926..e26563f0126 100644 --- a/solr/solrj/src/test/org/apache/solr/common/util/IteratorChainTest.java +++ b/solr/solrj/src/test/org/apache/solr/common/util/IteratorChainTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.util; import java.util.ArrayList; diff --git a/solr/solrj/src/test/org/apache/solr/common/util/NamedListTest.java b/solr/solrj/src/test/org/apache/solr/common/util/NamedListTest.java index 7bf3f4d09ef..2625e7d7631 100644 --- a/solr/solrj/src/test/org/apache/solr/common/util/NamedListTest.java +++ b/solr/solrj/src/test/org/apache/solr/common/util/NamedListTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.util; import java.util.ArrayList; diff --git a/solr/solrj/src/test/org/apache/solr/common/util/TestDateUtil.java b/solr/solrj/src/test/org/apache/solr/common/util/TestDateUtil.java index 4252b9348ee..1eab4f5b11f 100644 --- a/solr/solrj/src/test/org/apache/solr/common/util/TestDateUtil.java +++ b/solr/solrj/src/test/org/apache/solr/common/util/TestDateUtil.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 @@ -16,6 +14,7 @@ package org.apache.solr.common.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common.util; import java.text.ParseException; import java.util.Locale; diff --git a/solr/solrj/src/test/org/apache/solr/common/util/TestHash.java b/solr/solrj/src/test/org/apache/solr/common/util/TestHash.java index d3eb3d705c1..15d1660ff33 100644 --- a/solr/solrj/src/test/org/apache/solr/common/util/TestHash.java +++ b/solr/solrj/src/test/org/apache/solr/common/util/TestHash.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 @@ -16,6 +14,7 @@ package org.apache.solr.common.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common.util; import org.apache.lucene.util.LuceneTestCase; diff --git a/solr/solrj/src/test/org/apache/solr/common/util/TestJavaBinCodec.java b/solr/solrj/src/test/org/apache/solr/common/util/TestJavaBinCodec.java index f951c7795e4..b59eee9b00e 100644 --- a/solr/solrj/src/test/org/apache/solr/common/util/TestJavaBinCodec.java +++ b/solr/solrj/src/test/org/apache/solr/common/util/TestJavaBinCodec.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 @@ -16,6 +14,7 @@ package org.apache.solr.common.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common.util; import java.io.BufferedOutputStream; import java.io.ByteArrayInputStream; diff --git a/solr/solrj/src/test/org/apache/solr/common/util/TestJsonRecordReader.java b/solr/solrj/src/test/org/apache/solr/common/util/TestJsonRecordReader.java index 9d91f5ce9f7..328d7b3bf8d 100644 --- a/solr/solrj/src/test/org/apache/solr/common/util/TestJsonRecordReader.java +++ b/solr/solrj/src/test/org/apache/solr/common/util/TestJsonRecordReader.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 @@ -16,6 +14,7 @@ package org.apache.solr.common.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common.util; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.util.RecordingJSONParser; diff --git a/solr/solrj/src/test/org/apache/solr/common/util/TestRetryUtil.java b/solr/solrj/src/test/org/apache/solr/common/util/TestRetryUtil.java index e7ca97394b8..05bfce182fa 100644 --- a/solr/solrj/src/test/org/apache/solr/common/util/TestRetryUtil.java +++ b/solr/solrj/src/test/org/apache/solr/common/util/TestRetryUtil.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 @@ -16,6 +14,7 @@ package org.apache.solr.common.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.common.util; import java.util.concurrent.atomic.AtomicInteger; diff --git a/solr/solrj/src/test/org/apache/solr/common/util/TestXMLEscaping.java b/solr/solrj/src/test/org/apache/solr/common/util/TestXMLEscaping.java index 10555660ab2..8d5da1597b6 100644 --- a/solr/solrj/src/test/org/apache/solr/common/util/TestXMLEscaping.java +++ b/solr/solrj/src/test/org/apache/solr/common/util/TestXMLEscaping.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.util; import java.io.IOException; diff --git a/solr/solrj/src/test/org/apache/solr/common/util/URLUtilTest.java b/solr/solrj/src/test/org/apache/solr/common/util/URLUtilTest.java index 7c98999f563..b9685edc060 100644 --- a/solr/solrj/src/test/org/apache/solr/common/util/URLUtilTest.java +++ b/solr/solrj/src/test/org/apache/solr/common/util/URLUtilTest.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.common.util; import static org.junit.Assert.*; diff --git a/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java b/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java index 4142cf2ac18..ad006a4da8a 100644 --- a/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java +++ b/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java @@ -1,5 +1,3 @@ -package org.apache.solr; - /* * 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; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr; import junit.framework.Assert; diff --git a/solr/test-framework/src/java/org/apache/solr/JSONTestUtil.java b/solr/test-framework/src/java/org/apache/solr/JSONTestUtil.java index 1358431b548..634608b2bf4 100644 --- a/solr/test-framework/src/java/org/apache/solr/JSONTestUtil.java +++ b/solr/test-framework/src/java/org/apache/solr/JSONTestUtil.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr; import org.noggit.JSONParser; diff --git a/solr/test-framework/src/java/org/apache/solr/SolrIgnoredThreadsFilter.java b/solr/test-framework/src/java/org/apache/solr/SolrIgnoredThreadsFilter.java index 0a915d29e6b..96b6d3132a0 100644 --- a/solr/test-framework/src/java/org/apache/solr/SolrIgnoredThreadsFilter.java +++ b/solr/test-framework/src/java/org/apache/solr/SolrIgnoredThreadsFilter.java @@ -1,10 +1,3 @@ -package org.apache.solr; - -import org.apache.lucene.search.TimeLimitingCollector.TimerThread; - -import com.carrotsearch.randomizedtesting.ThreadFilter; - - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -21,6 +14,12 @@ import com.carrotsearch.randomizedtesting.ThreadFilter; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr; + +import org.apache.lucene.search.TimeLimitingCollector.TimerThread; + +import com.carrotsearch.randomizedtesting.ThreadFilter; + /** * This ignores those threads in Solr for which there is no way to diff --git a/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java b/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java index 0d10e22ccc5..0e77a471381 100644 --- a/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java +++ b/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java @@ -1,5 +1,3 @@ -package org.apache.solr; - /* * 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; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr; import org.apache.commons.io.FileUtils; import org.apache.lucene.util.LuceneTestCase; diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseHS.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseHS.java index 8914c342f31..a3f74e6edd4 100644 --- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseHS.java +++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseHS.java @@ -1,5 +1,3 @@ -package org.apache.solr; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -16,7 +14,7 @@ package org.apache.solr; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr; import com.google.common.base.Charsets; import org.apache.commons.io.FileUtils; diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java index d94e88654d7..66e6712a879 100644 --- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java +++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr; import javax.xml.xpath.XPathExpressionException; diff --git a/solr/test-framework/src/java/org/apache/solr/analysis/MockCharFilterFactory.java b/solr/test-framework/src/java/org/apache/solr/analysis/MockCharFilterFactory.java index b2c5e19d40b..48a57287162 100644 --- a/solr/test-framework/src/java/org/apache/solr/analysis/MockCharFilterFactory.java +++ b/solr/test-framework/src/java/org/apache/solr/analysis/MockCharFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.analysis; - /* * 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.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.analysis; import java.io.Reader; import java.util.Map; diff --git a/solr/test-framework/src/java/org/apache/solr/analysis/MockTokenFilterFactory.java b/solr/test-framework/src/java/org/apache/solr/analysis/MockTokenFilterFactory.java index 56d7c57f776..db329f2542c 100644 --- a/solr/test-framework/src/java/org/apache/solr/analysis/MockTokenFilterFactory.java +++ b/solr/test-framework/src/java/org/apache/solr/analysis/MockTokenFilterFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.analysis; - /* * 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.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.analysis; import java.util.Arrays; import java.util.Map; diff --git a/solr/test-framework/src/java/org/apache/solr/analysis/MockTokenizerFactory.java b/solr/test-framework/src/java/org/apache/solr/analysis/MockTokenizerFactory.java index da6beb1e018..df5a453a251 100644 --- a/solr/test-framework/src/java/org/apache/solr/analysis/MockTokenizerFactory.java +++ b/solr/test-framework/src/java/org/apache/solr/analysis/MockTokenizerFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.analysis; - /* * 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.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.analysis; import java.io.Reader; import java.util.Arrays; diff --git a/solr/test-framework/src/java/org/apache/solr/analysis/StringMockSolrResourceLoader.java b/solr/test-framework/src/java/org/apache/solr/analysis/StringMockSolrResourceLoader.java index bd2cec16d66..b00e979a9ff 100644 --- a/solr/test-framework/src/java/org/apache/solr/analysis/StringMockSolrResourceLoader.java +++ b/solr/test-framework/src/java/org/apache/solr/analysis/StringMockSolrResourceLoader.java @@ -1,5 +1,3 @@ -package org.apache.solr.analysis; - /* * 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.analysis; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.analysis; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractDistribZkTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractDistribZkTestBase.java index 824ad01fab3..ff423826080 100644 --- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractDistribZkTestBase.java +++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractDistribZkTestBase.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.io.File; import java.lang.invoke.MethodHandles; diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java index 5daa5ecc296..5f77f693d12 100644 --- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.java +++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractZkTestCase.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.common.cloud.SolrZkClient; diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java b/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java index 2cbb86893ec..d13d62f0683 100644 --- a/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java +++ b/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java @@ -1,7 +1,3 @@ -package org.apache.solr.cloud; - -import java.lang.invoke.MethodHandles; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import java.lang.invoke.MethodHandles; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; + +import java.lang.invoke.MethodHandles; import java.net.InetSocketAddress; import java.util.ArrayList; diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/CloudInspectUtil.java b/solr/test-framework/src/java/org/apache/solr/cloud/CloudInspectUtil.java index 32f5ebf129a..c66fa0a91b0 100644 --- a/solr/test-framework/src/java/org/apache/solr/cloud/CloudInspectUtil.java +++ b/solr/test-framework/src/java/org/apache/solr/cloud/CloudInspectUtil.java @@ -1,3 +1,19 @@ +/* + * 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 org.apache.solr.SolrTestCaseJ4; @@ -17,23 +33,6 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -/* - * 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 CloudInspectUtil { private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/IpTables.java b/solr/test-framework/src/java/org/apache/solr/cloud/IpTables.java index 5411d671cab..4ddbd27f598 100644 --- a/solr/test-framework/src/java/org/apache/solr/cloud/IpTables.java +++ b/solr/test-framework/src/java/org/apache/solr/cloud/IpTables.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 @@ -16,7 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.cloud; import java.io.IOException; import java.lang.invoke.MethodHandles; diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java b/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java index 1cfbe8483d6..002304173cc 100644 --- a/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java +++ b/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import javax.servlet.Filter; import java.io.File; diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/MockSolrZkClient.java b/solr/test-framework/src/java/org/apache/solr/cloud/MockSolrZkClient.java index e42c64f212d..9ce21bba4bc 100644 --- a/solr/test-framework/src/java/org/apache/solr/cloud/MockSolrZkClient.java +++ b/solr/test-framework/src/java/org/apache/solr/cloud/MockSolrZkClient.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import org.apache.solr.common.cloud.SolrZkClient; import org.apache.solr.common.cloud.ZkStateReader; diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/MockZkStateReader.java b/solr/test-framework/src/java/org/apache/solr/cloud/MockZkStateReader.java index be4ae9b7738..b0ba518f2bf 100644 --- a/solr/test-framework/src/java/org/apache/solr/cloud/MockZkStateReader.java +++ b/solr/test-framework/src/java/org/apache/solr/cloud/MockZkStateReader.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.util.Set; diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/SocketProxy.java b/solr/test-framework/src/java/org/apache/solr/cloud/SocketProxy.java index 1234a2363e8..71a3143c6ce 100644 --- a/solr/test-framework/src/java/org/apache/solr/cloud/SocketProxy.java +++ b/solr/test-framework/src/java/org/apache/solr/cloud/SocketProxy.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 @@ -16,6 +14,7 @@ package org.apache.solr.cloud; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; import java.io.IOException; import java.io.InputStream; diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/StoppableIndexingThread.java b/solr/test-framework/src/java/org/apache/solr/cloud/StoppableIndexingThread.java index 7a870c2dbf6..7dd88c1a526 100644 --- a/solr/test-framework/src/java/org/apache/solr/cloud/StoppableIndexingThread.java +++ b/solr/test-framework/src/java/org/apache/solr/cloud/StoppableIndexingThread.java @@ -1,16 +1,3 @@ -package org.apache.solr.cloud; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import org.apache.solr.client.solrj.SolrClient; -import org.apache.solr.client.solrj.SolrServerException; -import org.apache.solr.client.solrj.request.UpdateRequest; -import org.apache.solr.common.SolrInputDocument; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -27,6 +14,18 @@ import org.apache.solr.common.SolrInputDocument; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import org.apache.solr.client.solrj.SolrClient; +import org.apache.solr.client.solrj.SolrServerException; +import org.apache.solr.client.solrj.request.UpdateRequest; +import org.apache.solr.common.SolrInputDocument; public class StoppableIndexingThread extends AbstractFullDistribZkTestBase.StoppableThread { static String t1 = "a_t"; diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/StoppableSearchThread.java b/solr/test-framework/src/java/org/apache/solr/cloud/StoppableSearchThread.java index 7cbd9a92a28..fa916c654dc 100644 --- a/solr/test-framework/src/java/org/apache/solr/cloud/StoppableSearchThread.java +++ b/solr/test-framework/src/java/org/apache/solr/cloud/StoppableSearchThread.java @@ -1,7 +1,3 @@ -package org.apache.solr.cloud; - -import java.lang.invoke.MethodHandles; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -18,6 +14,9 @@ import java.lang.invoke.MethodHandles; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.cloud; + +import java.lang.invoke.MethodHandles; import java.util.Random; import java.util.concurrent.atomic.AtomicInteger; diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java b/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java index 62f3be1f7c3..4082c4bc10c 100644 --- a/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java +++ b/solr/test-framework/src/java/org/apache/solr/cloud/ZkTestServer.java @@ -1,21 +1,20 @@ -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 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 - * + * 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. + * 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 com.google.common.collect.Ordering; import com.google.common.util.concurrent.AtomicLongMap; diff --git a/solr/test-framework/src/java/org/apache/solr/core/AbstractBadConfigTestBase.java b/solr/test-framework/src/java/org/apache/solr/core/AbstractBadConfigTestBase.java index 4b90d3b0f45..1fa1c58da59 100644 --- a/solr/test-framework/src/java/org/apache/solr/core/AbstractBadConfigTestBase.java +++ b/solr/test-framework/src/java/org/apache/solr/core/AbstractBadConfigTestBase.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.core; import org.apache.solr.SolrTestCaseJ4; diff --git a/solr/test-framework/src/java/org/apache/solr/core/MockDirectoryFactory.java b/solr/test-framework/src/java/org/apache/solr/core/MockDirectoryFactory.java index 7f07f859ea7..31ebc967cc7 100644 --- a/solr/test-framework/src/java/org/apache/solr/core/MockDirectoryFactory.java +++ b/solr/test-framework/src/java/org/apache/solr/core/MockDirectoryFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.core; - /* * 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.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.core; import java.io.File; import java.io.IOException; diff --git a/solr/test-framework/src/java/org/apache/solr/core/MockFSDirectoryFactory.java b/solr/test-framework/src/java/org/apache/solr/core/MockFSDirectoryFactory.java index 1c3bbcdc96e..f35cef2cf6f 100644 --- a/solr/test-framework/src/java/org/apache/solr/core/MockFSDirectoryFactory.java +++ b/solr/test-framework/src/java/org/apache/solr/core/MockFSDirectoryFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.core; - /* * 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.core; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.core; import java.io.File; import java.io.IOException; diff --git a/solr/test-framework/src/java/org/apache/solr/handler/component/TrackingShardHandlerFactory.java b/solr/test-framework/src/java/org/apache/solr/handler/component/TrackingShardHandlerFactory.java index f4cd9b2f9ab..95a3179bb45 100644 --- a/solr/test-framework/src/java/org/apache/solr/handler/component/TrackingShardHandlerFactory.java +++ b/solr/test-framework/src/java/org/apache/solr/handler/component/TrackingShardHandlerFactory.java @@ -1,5 +1,3 @@ -package org.apache.solr.handler.component; - /* * 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.handler.component; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.handler.component; import java.util.ArrayList; import java.util.Collections; diff --git a/solr/test-framework/src/java/org/apache/solr/update/processor/BufferingRequestProcessor.java b/solr/test-framework/src/java/org/apache/solr/update/processor/BufferingRequestProcessor.java index 658d29bbbce..56b422909d2 100644 --- a/solr/test-framework/src/java/org/apache/solr/update/processor/BufferingRequestProcessor.java +++ b/solr/test-framework/src/java/org/apache/solr/update/processor/BufferingRequestProcessor.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.update.processor; import java.io.IOException; diff --git a/solr/test-framework/src/java/org/apache/solr/util/AbstractSolrTestCase.java b/solr/test-framework/src/java/org/apache/solr/util/AbstractSolrTestCase.java index f2d42e8058e..dcbdb49637e 100644 --- a/solr/test-framework/src/java/org/apache/solr/util/AbstractSolrTestCase.java +++ b/solr/test-framework/src/java/org/apache/solr/util/AbstractSolrTestCase.java @@ -14,8 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.apache.solr.util; diff --git a/solr/test-framework/src/java/org/apache/solr/util/BadHdfsThreadsFilter.java b/solr/test-framework/src/java/org/apache/solr/util/BadHdfsThreadsFilter.java index f1eea7a7d5f..e235182366d 100644 --- a/solr/test-framework/src/java/org/apache/solr/util/BadHdfsThreadsFilter.java +++ b/solr/test-framework/src/java/org/apache/solr/util/BadHdfsThreadsFilter.java @@ -1,5 +1,3 @@ -package org.apache.solr.util; - /* * 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.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; import com.carrotsearch.randomizedtesting.ThreadFilter; diff --git a/solr/test-framework/src/java/org/apache/solr/util/BadMrClusterThreadsFilter.java b/solr/test-framework/src/java/org/apache/solr/util/BadMrClusterThreadsFilter.java index b3738b01b80..3867e4856da 100644 --- a/solr/test-framework/src/java/org/apache/solr/util/BadMrClusterThreadsFilter.java +++ b/solr/test-framework/src/java/org/apache/solr/util/BadMrClusterThreadsFilter.java @@ -1,5 +1,3 @@ -package org.apache.solr.util; - /* * 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.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; import com.carrotsearch.randomizedtesting.ThreadFilter; diff --git a/solr/test-framework/src/java/org/apache/solr/util/BadZookeeperThreadsFilter.java b/solr/test-framework/src/java/org/apache/solr/util/BadZookeeperThreadsFilter.java index 2e89a6d7e8e..f9bd870819a 100644 --- a/solr/test-framework/src/java/org/apache/solr/util/BadZookeeperThreadsFilter.java +++ b/solr/test-framework/src/java/org/apache/solr/util/BadZookeeperThreadsFilter.java @@ -1,5 +1,3 @@ -package org.apache.solr.util; - /* * 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.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; import com.carrotsearch.randomizedtesting.ThreadFilter; diff --git a/solr/test-framework/src/java/org/apache/solr/util/BaseTestHarness.java b/solr/test-framework/src/java/org/apache/solr/util/BaseTestHarness.java index ba0a460fc54..eae9e54c671 100644 --- a/solr/test-framework/src/java/org/apache/solr/util/BaseTestHarness.java +++ b/solr/test-framework/src/java/org/apache/solr/util/BaseTestHarness.java @@ -1,4 +1,3 @@ -package org.apache.solr.util; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.util; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.util; import org.apache.solr.client.solrj.impl.HttpClientUtil; import org.apache.solr.common.SolrException; import org.apache.solr.common.util.XML; diff --git a/solr/test-framework/src/java/org/apache/solr/util/DOMUtilTestBase.java b/solr/test-framework/src/java/org/apache/solr/util/DOMUtilTestBase.java index c8ebb038faa..61a30072230 100644 --- a/solr/test-framework/src/java/org/apache/solr/util/DOMUtilTestBase.java +++ b/solr/test-framework/src/java/org/apache/solr/util/DOMUtilTestBase.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.util; diff --git a/solr/test-framework/src/java/org/apache/solr/util/ExternalPaths.java b/solr/test-framework/src/java/org/apache/solr/util/ExternalPaths.java index 1f826c613de..0cf958d7f22 100644 --- a/solr/test-framework/src/java/org/apache/solr/util/ExternalPaths.java +++ b/solr/test-framework/src/java/org/apache/solr/util/ExternalPaths.java @@ -1,5 +1,3 @@ -package org.apache.solr.util; - /* * 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.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; import java.io.File; import java.io.FileOutputStream; diff --git a/solr/test-framework/src/java/org/apache/solr/util/RESTfulServerProvider.java b/solr/test-framework/src/java/org/apache/solr/util/RESTfulServerProvider.java index d87a1d3044f..7c591675c81 100644 --- a/solr/test-framework/src/java/org/apache/solr/util/RESTfulServerProvider.java +++ b/solr/test-framework/src/java/org/apache/solr/util/RESTfulServerProvider.java @@ -1,4 +1,3 @@ -package org.apache.solr.util; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.util; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.util; public interface RESTfulServerProvider { public String getBaseURL(); } diff --git a/solr/test-framework/src/java/org/apache/solr/util/RandomForceMergePolicy.java b/solr/test-framework/src/java/org/apache/solr/util/RandomForceMergePolicy.java index a2cace7f3b3..92dc1300953 100755 --- a/solr/test-framework/src/java/org/apache/solr/util/RandomForceMergePolicy.java +++ b/solr/test-framework/src/java/org/apache/solr/util/RandomForceMergePolicy.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.util; import org.apache.lucene.index.ForceMergePolicy; diff --git a/solr/test-framework/src/java/org/apache/solr/util/RandomMergePolicy.java b/solr/test-framework/src/java/org/apache/solr/util/RandomMergePolicy.java index 17c53c0a87c..dac12ce0c47 100644 --- a/solr/test-framework/src/java/org/apache/solr/util/RandomMergePolicy.java +++ b/solr/test-framework/src/java/org/apache/solr/util/RandomMergePolicy.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.util; import java.io.IOException; diff --git a/solr/test-framework/src/java/org/apache/solr/util/ReadOnlyCoresLocator.java b/solr/test-framework/src/java/org/apache/solr/util/ReadOnlyCoresLocator.java index af370a95784..3d11ff733de 100644 --- a/solr/test-framework/src/java/org/apache/solr/util/ReadOnlyCoresLocator.java +++ b/solr/test-framework/src/java/org/apache/solr/util/ReadOnlyCoresLocator.java @@ -1,5 +1,3 @@ -package org.apache.solr.util; - /* * 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.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; import org.apache.solr.core.CoreContainer; import org.apache.solr.core.CoreDescriptor; diff --git a/solr/test-framework/src/java/org/apache/solr/util/RestTestBase.java b/solr/test-framework/src/java/org/apache/solr/util/RestTestBase.java index ec7ad41c092..06f578206ab 100644 --- a/solr/test-framework/src/java/org/apache/solr/util/RestTestBase.java +++ b/solr/test-framework/src/java/org/apache/solr/util/RestTestBase.java @@ -1,4 +1,3 @@ -package org.apache.solr.util; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.util; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.util; import org.apache.solr.JSONTestUtil; import org.apache.solr.SolrJettyTestBase; import org.apache.solr.common.SolrException; diff --git a/solr/test-framework/src/java/org/apache/solr/util/RestTestHarness.java b/solr/test-framework/src/java/org/apache/solr/util/RestTestHarness.java index 1fa50148435..de5f6623dfe 100644 --- a/solr/test-framework/src/java/org/apache/solr/util/RestTestHarness.java +++ b/solr/test-framework/src/java/org/apache/solr/util/RestTestHarness.java @@ -1,4 +1,3 @@ -package org.apache.solr.util; /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -15,7 +14,7 @@ package org.apache.solr.util; * See the License for the specific language governing permissions and * limitations under the License. */ - +package org.apache.solr.util; import org.apache.http.HttpEntity; import org.apache.http.client.methods.HttpDelete; import org.apache.http.client.methods.HttpGet; diff --git a/solr/test-framework/src/java/org/apache/solr/util/RevertDefaultThreadHandlerRule.java b/solr/test-framework/src/java/org/apache/solr/util/RevertDefaultThreadHandlerRule.java index a69771d7b92..a6f95a5c1ac 100644 --- a/solr/test-framework/src/java/org/apache/solr/util/RevertDefaultThreadHandlerRule.java +++ b/solr/test-framework/src/java/org/apache/solr/util/RevertDefaultThreadHandlerRule.java @@ -1,15 +1,3 @@ -package org.apache.solr.util; - -import java.lang.Thread.UncaughtExceptionHandler; -import java.util.concurrent.atomic.AtomicBoolean; - -import org.apache.zookeeper.server.NIOServerCnxnFactory; -import org.junit.rules.TestRule; -import org.junit.runner.Description; -import org.junit.runners.model.Statement; - -import com.carrotsearch.randomizedtesting.rules.StatementAdapter; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -26,6 +14,17 @@ import com.carrotsearch.randomizedtesting.rules.StatementAdapter; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; + +import java.lang.Thread.UncaughtExceptionHandler; +import java.util.concurrent.atomic.AtomicBoolean; + +import org.apache.zookeeper.server.NIOServerCnxnFactory; +import org.junit.rules.TestRule; +import org.junit.runner.Description; +import org.junit.runners.model.Statement; + +import com.carrotsearch.randomizedtesting.rules.StatementAdapter; public final class RevertDefaultThreadHandlerRule implements TestRule { private final static AtomicBoolean applied = new AtomicBoolean(); diff --git a/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java b/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java index b3e575fc6a7..3981c913071 100644 --- a/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java +++ b/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java @@ -1,5 +1,3 @@ -package org.apache.solr.util; - /* * 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.util; * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.solr.util; import java.io.File; import java.security.KeyManagementException; diff --git a/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java b/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java index 444f02a7479..1f4b33b6b1f 100644 --- a/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java +++ b/solr/test-framework/src/java/org/apache/solr/util/TestHarness.java @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.solr.util; import java.io.IOException; From eee6fa0bcf1be0963e6ec9b9c36dc2f0f47c6723 Mon Sep 17 00:00:00 2001 From: Uwe Schindler Date: Thu, 4 Feb 2016 20:54:18 +0100 Subject: [PATCH 08/12] LUCENE-7013: Fix javadocs by reverting to previous state (script failure possibly) --- .../src/java/org/apache/lucene/facet/range/package-info.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lucene/facet/src/java/org/apache/lucene/facet/range/package-info.java b/lucene/facet/src/java/org/apache/lucene/facet/range/package-info.java index 8e5d8125116..aa41077fc3e 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/range/package-info.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/range/package-info.java @@ -14,4 +14,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + +/** + * Provides range faceting capabilities. + */ package org.apache.lucene.facet.range; From 629767be0686d39995f2afc1f1f267f9d1a68cef Mon Sep 17 00:00:00 2001 From: yonik Date: Thu, 4 Feb 2016 14:54:08 -0500 Subject: [PATCH 09/12] SOLR-8586: add index fingerprinting and use it in peersync --- solr/CHANGES.txt | 5 + .../org/apache/solr/cloud/SyncStrategy.java | 2 +- .../component/RealTimeGetComponent.java | 8 + .../apache/solr/update/IndexFingerprint.java | 232 ++++++++++++++++++ .../java/org/apache/solr/update/PeerSync.java | 78 ++++-- .../org/apache/solr/update/UpdateLog.java | 4 +- .../org/apache/solr/update/PeerSyncTest.java | 23 ++ 7 files changed, 334 insertions(+), 18 deletions(-) create mode 100644 solr/core/src/java/org/apache/solr/update/IndexFingerprint.java diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index ef22a2ff4c0..c396d393873 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -344,6 +344,10 @@ New Features * SOLR-8560: Added RequestStatusState enum which can be used when comparing states of asynchronous requests. (Shai Erera) +* SOLR-8586: added index fingerprint, a hash over all versions currently in the index. + PeerSync now uses this to check if replicas are in sync. (yonik) + + Bug Fixes ---------------------- @@ -440,6 +444,7 @@ Bug Fixes * SOLR-8607: The Schema API refuses to add new fields that match existing dynamic fields. (Jan Høydahl, Steve Rowe) + Optimizations ---------------------- diff --git a/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java b/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java index 7a16598bbcd..d811f5c1d93 100644 --- a/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java +++ b/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java @@ -173,7 +173,7 @@ public class SyncStrategy { // if we can't reach a replica for sync, we still consider the overall sync a success // TODO: as an assurance, we should still try and tell the sync nodes that we couldn't reach // to recover once more? - PeerSync peerSync = new PeerSync(core, syncWith, core.getUpdateHandler().getUpdateLog().getNumRecordsToKeep(), true, true, peerSyncOnlyWithActive); + PeerSync peerSync = new PeerSync(core, syncWith, core.getUpdateHandler().getUpdateLog().getNumRecordsToKeep(), true, true, peerSyncOnlyWithActive, false); return peerSync.sync(); } diff --git a/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java b/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java index 2e1f729a43c..2f71b3e8a37 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java +++ b/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java @@ -66,6 +66,7 @@ import org.apache.solr.search.SolrIndexSearcher; import org.apache.solr.search.SolrReturnFields; import org.apache.solr.search.SyntaxError; import org.apache.solr.update.DocumentBuilder; +import org.apache.solr.update.IndexFingerprint; import org.apache.solr.update.PeerSync; import org.apache.solr.update.UpdateLog; import org.apache.solr.util.RefCounted; @@ -596,6 +597,8 @@ public class RealTimeGetComponent extends SearchComponent int nVersions = params.getInt("getVersions", -1); if (nVersions == -1) return; + boolean doFingerprint = params.getBool("fingerprint", false); + String sync = params.get("sync"); if (sync != null) { processSync(rb, nVersions, sync); @@ -608,6 +611,11 @@ public class RealTimeGetComponent extends SearchComponent try (UpdateLog.RecentUpdates recentUpdates = ulog.getRecentUpdates()) { rb.rsp.add("versions", recentUpdates.getVersions(nVersions)); } + + if (doFingerprint) { + IndexFingerprint fingerprint = IndexFingerprint.getFingerprint(req.getCore(), Long.MAX_VALUE); + rb.rsp.add("fingerprint", fingerprint.toObject()); + } } diff --git a/solr/core/src/java/org/apache/solr/update/IndexFingerprint.java b/solr/core/src/java/org/apache/solr/update/IndexFingerprint.java new file mode 100644 index 00000000000..c73b57b7a07 --- /dev/null +++ b/solr/core/src/java/org/apache/solr/update/IndexFingerprint.java @@ -0,0 +1,232 @@ +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 + * 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. + */ + +import java.io.IOException; +import java.lang.invoke.MethodHandles; +import java.net.ConnectException; +import java.net.SocketException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.apache.http.NoHttpResponseException; +import org.apache.http.client.HttpClient; +import org.apache.http.conn.ConnectTimeoutException; +import org.apache.lucene.index.LeafReader; +import org.apache.lucene.index.LeafReaderContext; +import org.apache.lucene.queries.function.FunctionValues; +import org.apache.lucene.queries.function.ValueSource; +import org.apache.lucene.util.Bits; +import org.apache.lucene.util.BytesRef; +import org.apache.solr.client.solrj.SolrServerException; +import org.apache.solr.cloud.ZkController; +import org.apache.solr.common.SolrException; +import org.apache.solr.common.SolrInputDocument; +import org.apache.solr.common.params.ModifiableSolrParams; +import org.apache.solr.common.util.Hash; +import org.apache.solr.common.util.NamedList; +import org.apache.solr.common.util.StrUtils; +import org.apache.solr.core.SolrCore; +import org.apache.solr.handler.component.HttpShardHandlerFactory; +import org.apache.solr.handler.component.ShardHandler; +import org.apache.solr.handler.component.ShardHandlerFactory; +import org.apache.solr.handler.component.ShardRequest; +import org.apache.solr.handler.component.ShardResponse; +import org.apache.solr.logging.MDCLoggingContext; +import org.apache.solr.request.LocalSolrQueryRequest; +import org.apache.solr.request.SolrQueryRequest; +import org.apache.solr.response.SolrQueryResponse; +import org.apache.solr.schema.SchemaField; +import org.apache.solr.search.SolrIndexSearcher; +import org.apache.solr.update.processor.UpdateRequestProcessor; +import org.apache.solr.update.processor.UpdateRequestProcessorChain; +import org.apache.solr.util.RefCounted; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import static org.apache.solr.update.processor.DistributedUpdateProcessor.DistribPhase.FROMLEADER; +import static org.apache.solr.update.processor.DistributingUpdateProcessorFactory.DISTRIB_UPDATE_PARAM; + +/** @lucene.internal */ +public class IndexFingerprint { + private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); + + private long maxVersionSpecified; + private long maxVersionEncountered; + private long maxInHash; + private long versionsHash; + private long numVersions; + private long numDocs; + private long maxDoc; + + public long getMaxVersionSpecified() { + return maxVersionSpecified; + } + + public long getMaxVersionEncountered() { + return maxVersionEncountered; + } + + public long getMaxInHash() { + return maxInHash; + } + + public long getVersionsHash() { + return versionsHash; + } + + public long getNumVersions() { + return numVersions; + } + + public long getNumDocs() { + return numDocs; + } + + public long getMaxDoc() { + return maxDoc; + } + + /** Opens a new realtime searcher and returns it's fingerprint */ + public static IndexFingerprint getFingerprint(SolrCore core, long maxVersion) throws IOException { + core.getUpdateHandler().getUpdateLog().openRealtimeSearcher(); + RefCounted newestSearcher = core.getUpdateHandler().getUpdateLog().uhandler.core.getRealtimeSearcher(); + try { + return getFingerprint(newestSearcher.get(), maxVersion); + } finally { + if (newestSearcher != null) { + newestSearcher.decref(); + } + } + } + + public static IndexFingerprint getFingerprint(SolrIndexSearcher searcher, long maxVersion) throws IOException { + long start = System.currentTimeMillis(); + + SchemaField versionField = VersionInfo.getAndCheckVersionField(searcher.getSchema()); + + IndexFingerprint f = new IndexFingerprint(); + f.maxVersionSpecified = maxVersion; + f.maxDoc = searcher.maxDoc(); + + // TODO: this could be parallelized, or even cached per-segment if performance becomes an issue + ValueSource vs = versionField.getType().getValueSource(versionField, null); + Map funcContext = ValueSource.newContext(searcher); + vs.createWeight(funcContext, searcher); + for (LeafReaderContext ctx : searcher.getTopReaderContext().leaves()) { + int maxDoc = ctx.reader().maxDoc(); + f.numDocs += ctx.reader().numDocs(); + Bits liveDocs = ctx.reader().getLiveDocs(); + FunctionValues fv = vs.getValues(funcContext, ctx); + for (int doc = 0; doc < maxDoc; doc++) { + if (liveDocs != null && !liveDocs.get(doc)) continue; + long v = fv.longVal(doc); + f.maxVersionEncountered = Math.max(v, f.maxVersionEncountered); + if (v <= f.maxVersionSpecified) { + f.maxInHash = Math.max(v, f.maxInHash); + f.versionsHash += Hash.fmix64(v); + f.numVersions++; + } + } + } + + long end = System.currentTimeMillis(); + log.info("IndexFingerprint millis:" + (end-start) + " result:" + f); + + return f; + } + + /** returns 0 for equal, negative if f1 is less recent than f2, positive if more recent */ + public static int compare(IndexFingerprint f1, IndexFingerprint f2) { + int cmp; + + // NOTE: some way want number of docs in index to take precedence over highest version (add-only systems for sure) + + // if we're comparing all of the versions in the index, then go by the highest encountered. + if (f1.maxVersionSpecified == Long.MAX_VALUE) { + cmp = Long.compare(f1.maxVersionEncountered, f2.maxVersionEncountered); + if (cmp != 0) return cmp; + } + + // Go by the highest version under the requested max. + cmp = Long.compare(f1.maxInHash, f2.maxInHash); + if (cmp != 0) return cmp; + + // go by who has the most documents in the index + cmp = Long.compare(f1.numVersions, f2.numVersions); + if (cmp != 0) return cmp; + + // both have same number of documents, so go by hash + cmp = Long.compare(f1.versionsHash, f2.versionsHash); + return cmp; + } + + /** + * Create a generic object suitable for serializing with ResponseWriters + */ + public Object toObject() { + Map map = new LinkedHashMap<>(); + map.put("maxVersionSpecified", maxVersionSpecified); + map.put("maxVersionEncountered", maxVersionEncountered); + map.put("maxInHash", maxInHash); + map.put("versionsHash", versionsHash); + map.put("numVersions", numVersions); + map.put("numDocs", numDocs); + map.put("maxDoc", maxDoc); + return map; + } + + private static long getLong(Object o, String key, long def) { + long v = def; + + Object oval = null; + if (o instanceof Map) { + oval = ((Map)o).get(key); + } else if (o instanceof NamedList) { + oval = ((NamedList)o).get(key); + } + + return oval != null ? ((Number)oval).longValue() : def; + } + + /** + * Create an IndexFingerprint object from a deserialized generic object (Map or NamedList) + */ + public static IndexFingerprint fromObject(Object o) { + IndexFingerprint f = new IndexFingerprint(); + f.maxVersionSpecified = getLong(o, "maxVersionSpecified", Long.MAX_VALUE); + f.maxVersionEncountered = getLong(o, "maxVersionEncountered", -1); + f.maxInHash = getLong(o, "maxInHash", -1); + f.versionsHash = getLong(o, "versionsHash", -1); + f.numVersions = getLong(o, "numVersions", -1); + f.numDocs = getLong(o, "numDocs", -1); + f.maxDoc = getLong(o, "maxDoc", -1); + return f; + } + + @Override + public String toString() { + return toObject().toString(); + } +} diff --git a/solr/core/src/java/org/apache/solr/update/PeerSync.java b/solr/core/src/java/org/apache/solr/update/PeerSync.java index dacb470351a..ea717830c07 100644 --- a/solr/core/src/java/org/apache/solr/update/PeerSync.java +++ b/solr/core/src/java/org/apache/solr/update/PeerSync.java @@ -68,6 +68,7 @@ public class PeerSync { private UpdateLog ulog; private HttpShardHandlerFactory shardHandlerFactory; private ShardHandler shardHandler; + private List requests = new ArrayList<>(); private List startingVersions; @@ -76,8 +77,10 @@ public class PeerSync { private Set requestedUpdateSet; private long ourLowThreshold; // 20th percentile private long ourHighThreshold; // 80th percentile + private long ourHighest; // currently just used for logging/debugging purposes private final boolean cantReachIsSuccess; private final boolean getNoVersionsIsSuccess; + private final boolean doFingerprint; private final HttpClient client; private final boolean onlyIfActive; private SolrCore core; @@ -116,6 +119,8 @@ public class PeerSync { private static class SyncShardRequest extends ShardRequest { List reportedVersions; + IndexFingerprint fingerprint; + boolean doFingerprintComparison; List requestedUpdates; Exception updateException; } @@ -125,16 +130,17 @@ public class PeerSync { } public PeerSync(SolrCore core, List replicas, int nUpdates, boolean cantReachIsSuccess, boolean getNoVersionsIsSuccess) { - this(core, replicas, nUpdates, cantReachIsSuccess, getNoVersionsIsSuccess, false); + this(core, replicas, nUpdates, cantReachIsSuccess, getNoVersionsIsSuccess, false, true); } - public PeerSync(SolrCore core, List replicas, int nUpdates, boolean cantReachIsSuccess, boolean getNoVersionsIsSuccess, boolean onlyIfActive) { + public PeerSync(SolrCore core, List replicas, int nUpdates, boolean cantReachIsSuccess, boolean getNoVersionsIsSuccess, boolean onlyIfActive, boolean doFingerprint) { this.core = core; this.replicas = replicas; this.nUpdates = nUpdates; this.maxUpdates = nUpdates; this.cantReachIsSuccess = cantReachIsSuccess; this.getNoVersionsIsSuccess = getNoVersionsIsSuccess; + this.doFingerprint = doFingerprint; this.client = core.getCoreDescriptor().getCoreContainer().getUpdateShardHandler().getHttpClient(); this.onlyIfActive = onlyIfActive; @@ -169,9 +175,8 @@ public class PeerSync { return "PeerSync: core="+uhandler.core.getName()+ " url="+myURL +" "; } - /** Returns true if peer sync was successful, meaning that this core may not be considered to have the latest updates - * when considering the last N updates between it and its peers. - * A commit is not performed. + /** Returns true if peer sync was successful, meaning that this core may be considered to have the latest updates. + * It does not mean that the remote replica is in sync with us. */ public boolean sync() { if (ulog == null) { @@ -210,7 +215,7 @@ public class PeerSync { ourLowThreshold = percentile(startingVersions, 0.8f); ourHighThreshold = percentile(startingVersions, 0.2f); - + // now make sure that the starting updates overlap our updates // there shouldn't be reorders, so any overlap will do. @@ -231,6 +236,7 @@ public class PeerSync { } ourUpdates = newList; + Collections.sort(ourUpdates, absComparator); } else { if (ourUpdates.size() > 0) { @@ -243,9 +249,10 @@ public class PeerSync { return false; } } - + + ourHighest = ourUpdates.get(0); ourUpdateSet = new HashSet<>(ourUpdates); - requestedUpdateSet = new HashSet<>(ourUpdates); + requestedUpdateSet = new HashSet<>(); for (;;) { ShardResponse srsp = shardHandler.takeCompletedOrError(); @@ -257,9 +264,18 @@ public class PeerSync { return false; } } - - log.info(msg() + "DONE. sync succeeded"); - return true; + + // finish up any comparisons with other shards that we deferred + boolean success = true; + for (SyncShardRequest sreq : requests) { + if (sreq.doFingerprintComparison) { + success = compareFingerprint(sreq); + if (!success) break; + } + } + + log.info(msg() + "DONE. sync " + (success ? "succeeded" : "failed")); + return success; } finally { MDCLoggingContext.clear(); } @@ -267,6 +283,7 @@ public class PeerSync { private void requestVersions(String replica) { SyncShardRequest sreq = new SyncShardRequest(); + requests.add(sreq); sreq.purpose = 1; sreq.shards = new String[]{replica}; sreq.actualShards = sreq.shards; @@ -274,6 +291,7 @@ public class PeerSync { sreq.params.set("qt","/get"); sreq.params.set("distrib",false); sreq.params.set("getVersions",nUpdates); + sreq.params.set("fingerprint",doFingerprint); shardHandler.submit(sreq, replica, sreq.params); } @@ -355,7 +373,12 @@ public class PeerSync { SyncShardRequest sreq = (SyncShardRequest) srsp.getShardRequest(); sreq.reportedVersions = otherVersions; - log.info(msg() + " Received " + otherVersions.size() + " versions from " + sreq.shards[0] ); + Object fingerprint = srsp.getSolrResponse().getResponse().get("fingerprint"); + + log.info(msg() + " Received " + otherVersions.size() + " versions from " + sreq.shards[0] + " fingerprint:" + fingerprint ); + if (fingerprint != null) { + sreq.fingerprint = IndexFingerprint.fromObject(fingerprint); + } if (otherVersions.size() == 0) { return getNoVersionsIsSuccess; @@ -371,13 +394,14 @@ public class PeerSync { long otherHigh = percentile(otherVersions, .2f); long otherLow = percentile(otherVersions, .8f); + long otherHighest = otherVersions.get(0); if (ourHighThreshold < otherLow) { // Small overlap between version windows and ours is older // This means that we might miss updates if we attempted to use this method. // Since there exists just one replica that is so much newer, we must // fail the sync. - log.info(msg() + " Our versions are too old. ourHighThreshold="+ourHighThreshold + " otherLowThreshold="+otherLow); + log.info(msg() + " Our versions are too old. ourHighThreshold="+ourHighThreshold + " otherLowThreshold="+otherLow + " ourHighest=" + ourHighest + " otherHighest=" + otherHighest); return false; } @@ -385,7 +409,10 @@ public class PeerSync { // Small overlap between windows and ours is newer. // Using this list to sync would result in requesting/replaying results we don't need // and possibly bringing deleted docs back to life. - log.info(msg() + " Our versions are newer. ourLowThreshold="+ourLowThreshold + " otherHigh="+otherHigh); + log.info(msg() + " Our versions are newer. ourLowThreshold="+ourLowThreshold + " otherHigh="+otherHigh+ " ourHighest=" + ourHighest + " otherHighest=" + otherHighest); + + // Because our versions are newer, IndexFingerprint with the remote would not match us. + // We return true on our side, but the remote peersync with us should fail. return true; } @@ -408,9 +435,15 @@ public class PeerSync { sreq.requestedUpdates = toRequest; if (toRequest.isEmpty()) { - log.info(msg() + " Our versions are newer. ourLowThreshold="+ourLowThreshold + " otherHigh="+otherHigh); + log.info(msg() + " No additional versions requested. ourLowThreshold="+ourLowThreshold + " otherHigh="+otherHigh+ " ourHighest=" + ourHighest + " otherHighest=" + otherHighest); // we had (or already requested) all the updates referenced by the replica + + // If we requested updates from another replica, we can't compare fingerprints yet with this replica, we need to defer + if (doFingerprint) { + sreq.doFingerprintComparison = true; + } + return true; } @@ -422,6 +455,19 @@ public class PeerSync { return requestUpdates(srsp, toRequest); } + private boolean compareFingerprint(SyncShardRequest sreq) { + if (sreq.fingerprint == null) return true; + try { + IndexFingerprint ourFingerprint = IndexFingerprint.getFingerprint(core, Long.MAX_VALUE); + int cmp = IndexFingerprint.compare(ourFingerprint, sreq.fingerprint); + log.info("Fingerprint comparison: " + cmp); + return cmp == 0; // currently, we only check for equality... + } catch(IOException e){ + log.error(msg() + "Error getting index fingerprint", e); + return false; + } + } + private boolean requestUpdates(ShardResponse srsp, List toRequest) { String replica = srsp.getShardRequest().shards[0]; @@ -556,7 +602,7 @@ public class PeerSync { } } - return true; + return compareFingerprint(sreq); } diff --git a/solr/core/src/java/org/apache/solr/update/UpdateLog.java b/solr/core/src/java/org/apache/solr/update/UpdateLog.java index c63d807d297..78c30b95d29 100644 --- a/solr/core/src/java/org/apache/solr/update/UpdateLog.java +++ b/solr/core/src/java/org/apache/solr/update/UpdateLog.java @@ -505,7 +505,9 @@ public class UpdateLog implements PluginInfoInitialized { } } - /** Opens a new realtime searcher and clears the id caches */ + /** Opens a new realtime searcher and clears the id caches. + * This may also be called when we updates are being buffered (from PeerSync/IndexFingerprint) + */ public void openRealtimeSearcher() { synchronized (this) { // We must cause a new IndexReader to be opened before anything looks at these caches again diff --git a/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java b/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java index 8083ad066e1..bcaf84662f2 100644 --- a/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java +++ b/solr/core/src/test/org/apache/solr/update/PeerSyncTest.java @@ -168,6 +168,29 @@ public class PeerSyncTest extends BaseDistributedSearchTestCase { assertSync(client1, numVersions, true, shardsArr[0]); client0.commit(); client1.commit(); queryAndCompare(params("q", "*:*", "sort","_version_ desc"), client0, client1); + + // now lets check fingerprinting causes appropriate fails + v = 4000; + add(client0, seenLeader, sdoc("id",Integer.toString((int)v),"_version_",v)); + toAdd = numVersions+10; + for (int i=0; i Date: Thu, 4 Feb 2016 23:02:50 +0100 Subject: [PATCH 10/12] LUCENE-7013: Revert changes to package-info.java files (adds newline after license header and before javadocs back) --- .../src/java/org/apache/lucene/analysis/ar/package-info.java | 1 + .../src/java/org/apache/lucene/analysis/bg/package-info.java | 1 + .../src/java/org/apache/lucene/analysis/br/package-info.java | 1 + .../src/java/org/apache/lucene/analysis/ca/package-info.java | 1 + .../org/apache/lucene/analysis/charfilter/package-info.java | 1 + .../src/java/org/apache/lucene/analysis/cjk/package-info.java | 1 + .../src/java/org/apache/lucene/analysis/ckb/package-info.java | 1 + .../org/apache/lucene/analysis/commongrams/package-info.java | 1 + .../lucene/analysis/compound/hyphenation/package-info.java | 1 + .../java/org/apache/lucene/analysis/compound/package-info.java | 1 + .../src/java/org/apache/lucene/analysis/core/package-info.java | 1 + .../java/org/apache/lucene/analysis/custom/package-info.java | 1 + .../src/java/org/apache/lucene/analysis/cz/package-info.java | 1 + .../src/java/org/apache/lucene/analysis/da/package-info.java | 1 + .../src/java/org/apache/lucene/analysis/de/package-info.java | 1 + .../src/java/org/apache/lucene/analysis/el/package-info.java | 1 + .../src/java/org/apache/lucene/analysis/en/package-info.java | 1 + .../src/java/org/apache/lucene/analysis/es/package-info.java | 1 + .../src/java/org/apache/lucene/analysis/eu/package-info.java | 1 + .../src/java/org/apache/lucene/analysis/fa/package-info.java | 1 + .../src/java/org/apache/lucene/analysis/fi/package-info.java | 1 + .../src/java/org/apache/lucene/analysis/fr/package-info.java | 1 + .../src/java/org/apache/lucene/analysis/ga/package-info.java | 1 + .../src/java/org/apache/lucene/analysis/gl/package-info.java | 1 + .../src/java/org/apache/lucene/analysis/hi/package-info.java | 1 + .../src/java/org/apache/lucene/analysis/hu/package-info.java | 1 + .../java/org/apache/lucene/analysis/hunspell/package-info.java | 1 + .../src/java/org/apache/lucene/analysis/hy/package-info.java | 1 + .../src/java/org/apache/lucene/analysis/id/package-info.java | 1 + .../src/java/org/apache/lucene/analysis/in/package-info.java | 1 + .../src/java/org/apache/lucene/analysis/it/package-info.java | 1 + .../src/java/org/apache/lucene/analysis/lt/package-info.java | 1 + .../src/java/org/apache/lucene/analysis/lv/package-info.java | 1 + .../org/apache/lucene/analysis/miscellaneous/package-info.java | 1 + .../java/org/apache/lucene/analysis/ngram/package-info.java | 1 + .../src/java/org/apache/lucene/analysis/nl/package-info.java | 1 + .../src/java/org/apache/lucene/analysis/no/package-info.java | 1 + .../src/java/org/apache/lucene/analysis/path/package-info.java | 1 + .../java/org/apache/lucene/analysis/pattern/package-info.java | 1 + .../java/org/apache/lucene/analysis/payloads/package-info.java | 1 + .../src/java/org/apache/lucene/analysis/pt/package-info.java | 1 + .../java/org/apache/lucene/analysis/query/package-info.java | 1 + .../java/org/apache/lucene/analysis/reverse/package-info.java | 1 + .../src/java/org/apache/lucene/analysis/ro/package-info.java | 1 + .../src/java/org/apache/lucene/analysis/ru/package-info.java | 1 + .../java/org/apache/lucene/analysis/shingle/package-info.java | 1 + .../java/org/apache/lucene/analysis/sinks/package-info.java | 1 + .../java/org/apache/lucene/analysis/snowball/package-info.java | 1 + .../src/java/org/apache/lucene/analysis/sr/package-info.java | 1 + .../java/org/apache/lucene/analysis/standard/package-info.java | 1 + .../src/java/org/apache/lucene/analysis/sv/package-info.java | 1 + .../java/org/apache/lucene/analysis/synonym/package-info.java | 1 + .../src/java/org/apache/lucene/analysis/th/package-info.java | 1 + .../src/java/org/apache/lucene/analysis/tr/package-info.java | 1 + .../src/java/org/apache/lucene/analysis/util/package-info.java | 1 + .../org/apache/lucene/analysis/wikipedia/package-info.java | 1 + .../src/java/org/apache/lucene/collation/package-info.java | 1 + .../apache/lucene/collation/tokenattributes/package-info.java | 1 + .../src/java/org/tartarus/snowball/ext/package-info.java | 1 + .../common/src/java/org/tartarus/snowball/package-info.java | 1 + .../src/java/org/apache/lucene/analysis/icu/package-info.java | 1 + .../apache/lucene/analysis/icu/segmentation/package-info.java | 1 + .../lucene/analysis/icu/tokenattributes/package-info.java | 1 + .../java/org/apache/lucene/analysis/ja/dict/package-info.java | 1 + .../src/java/org/apache/lucene/analysis/ja/package-info.java | 1 + .../lucene/analysis/ja/tokenattributes/package-info.java | 1 + .../java/org/apache/lucene/analysis/ja/util/package-info.java | 1 + .../org/apache/lucene/analysis/morfologik/package-info.java | 1 + .../java/org/apache/lucene/analysis/phonetic/package-info.java | 1 + .../org/apache/lucene/analysis/cn/smart/hhmm/package-info.java | 1 + .../java/org/apache/lucene/analysis/cn/smart/package-info.java | 1 + .../src/java/org/apache/lucene/analysis/pl/package-info.java | 1 + .../java/org/apache/lucene/analysis/stempel/package-info.java | 1 + .../stempel/src/java/org/egothor/stemmer/package-info.java | 1 + .../java/org/apache/lucene/analysis/uima/ae/package-info.java | 1 + .../src/java/org/apache/lucene/analysis/uima/package-info.java | 1 + .../org/apache/lucene/benchmark/byTask/feeds/package-info.java | 1 + .../java/org/apache/lucene/benchmark/byTask/package-info.java | 1 + .../lucene/benchmark/byTask/programmatic/package-info.java | 1 + .../org/apache/lucene/benchmark/byTask/stats/package-info.java | 1 + .../org/apache/lucene/benchmark/byTask/tasks/package-info.java | 1 + .../org/apache/lucene/benchmark/byTask/utils/package-info.java | 1 + .../src/java/org/apache/lucene/benchmark/package-info.java | 1 + .../java/org/apache/lucene/benchmark/quality/package-info.java | 1 + .../org/apache/lucene/benchmark/quality/trec/package-info.java | 1 + .../apache/lucene/benchmark/quality/utils/package-info.java | 1 + .../java/org/apache/lucene/benchmark/utils/package-info.java | 1 + .../apache/lucene/classification/document/package-info.java | 1 + .../java/org/apache/lucene/classification/package-info.java | 1 + .../org/apache/lucene/classification/utils/package-info.java | 1 + .../java/org/apache/lucene/codecs/autoprefix/package-info.java | 1 + .../java/org/apache/lucene/codecs/blockterms/package-info.java | 1 + .../org/apache/lucene/codecs/blocktreeords/package-info.java | 1 + .../src/java/org/apache/lucene/codecs/bloom/package-info.java | 1 + .../src/java/org/apache/lucene/codecs/memory/package-info.java | 1 + .../java/org/apache/lucene/codecs/simpletext/package-info.java | 1 + .../core/src/java/org/apache/lucene/analysis/package-info.java | 1 + .../apache/lucene/analysis/tokenattributes/package-info.java | 1 + .../java/org/apache/lucene/codecs/blocktree/package-info.java | 1 + .../org/apache/lucene/codecs/compressing/package-info.java | 3 ++- .../java/org/apache/lucene/codecs/lucene50/package-info.java | 1 + .../java/org/apache/lucene/codecs/lucene53/package-info.java | 1 + .../java/org/apache/lucene/codecs/lucene54/package-info.java | 1 + .../java/org/apache/lucene/codecs/lucene60/package-info.java | 1 + .../core/src/java/org/apache/lucene/codecs/package-info.java | 1 + .../java/org/apache/lucene/codecs/perfield/package-info.java | 1 + .../core/src/java/org/apache/lucene/document/package-info.java | 1 + lucene/core/src/java/org/apache/lucene/index/package-info.java | 1 + lucene/core/src/java/org/apache/lucene/package-info.java | 3 ++- .../core/src/java/org/apache/lucene/search/package-info.java | 1 + .../org/apache/lucene/search/similarities/package-info.java | 1 + .../src/java/org/apache/lucene/search/spans/package-info.java | 1 + lucene/core/src/java/org/apache/lucene/store/package-info.java | 1 + .../core/src/java/org/apache/lucene/util/bkd/package-info.java | 1 + .../core/src/java/org/apache/lucene/util/fst/package-info.java | 1 + .../src/java/org/apache/lucene/util/mutable/package-info.java | 1 + lucene/core/src/java/org/apache/lucene/util/package-info.java | 1 + .../src/java/org/apache/lucene/util/packed/package-info.java | 1 + .../src/java/org/apache/lucene/demo/facet/package-info.java | 1 + lucene/demo/src/java/org/apache/lucene/demo/package-info.java | 1 + .../java/org/apache/lucene/demo/xmlparser/package-info.java | 1 + .../java/org/apache/lucene/expressions/js/package-info.java | 1 + .../src/java/org/apache/lucene/expressions/package-info.java | 1 + .../apache/lucene/search/grouping/function/package-info.java | 1 + .../java/org/apache/lucene/search/grouping/package-info.java | 1 + .../org/apache/lucene/search/grouping/term/package-info.java | 1 + .../java/org/apache/lucene/search/highlight/package-info.java | 1 + .../apache/lucene/search/postingshighlight/package-info.java | 1 + .../org/apache/lucene/search/vectorhighlight/package-info.java | 1 + .../src/java/org/apache/lucene/search/join/package-info.java | 1 + .../src/java/org/apache/lucene/index/memory/package-info.java | 1 + lucene/misc/src/java/org/apache/lucene/misc/package-info.java | 1 + .../src/java/org/apache/lucene/uninverting/package-info.java | 1 + .../apache/lucene/queries/function/docvalues/package-info.java | 1 + .../java/org/apache/lucene/queries/function/package-info.java | 1 + .../lucene/queries/function/valuesource/package-info.java | 1 + .../src/java/org/apache/lucene/queries/mlt/package-info.java | 1 + .../src/java/org/apache/lucene/queries/package-info.java | 1 + .../java/org/apache/lucene/queries/payloads/package-info.java | 1 + .../org/apache/lucene/queryparser/analyzing/package-info.java | 1 + .../org/apache/lucene/queryparser/classic/package-info.java | 2 ++ .../apache/lucene/queryparser/complexPhrase/package-info.java | 1 + .../java/org/apache/lucene/queryparser/ext/package-info.java | 1 + .../queryparser/flexible/core/builders/package-info.java | 1 + .../lucene/queryparser/flexible/core/config/package-info.java | 1 + .../queryparser/flexible/core/messages/package-info.java | 1 + .../lucene/queryparser/flexible/core/nodes/package-info.java | 1 + .../apache/lucene/queryparser/flexible/core/package-info.java | 1 + .../lucene/queryparser/flexible/core/parser/package-info.java | 1 + .../queryparser/flexible/core/processors/package-info.java | 1 + .../lucene/queryparser/flexible/core/util/package-info.java | 1 + .../lucene/queryparser/flexible/messages/package-info.java | 1 + .../lucene/queryparser/flexible/precedence/package-info.java | 1 + .../queryparser/flexible/standard/builders/package-info.java | 1 + .../queryparser/flexible/standard/config/package-info.java | 1 + .../queryparser/flexible/standard/nodes/package-info.java | 1 + .../lucene/queryparser/flexible/standard/package-info.java | 1 + .../queryparser/flexible/standard/parser/package-info.java | 1 + .../queryparser/flexible/standard/processors/package-info.java | 1 + .../org/apache/lucene/queryparser/simple/package-info.java | 1 + .../lucene/queryparser/surround/parser/package-info.java | 1 + .../apache/lucene/queryparser/surround/query/package-info.java | 1 + .../apache/lucene/queryparser/xml/builders/package-info.java | 1 + .../java/org/apache/lucene/queryparser/xml/package-info.java | 1 + .../java/org/apache/lucene/replicator/http/package-info.java | 1 + .../src/java/org/apache/lucene/replicator/package-info.java | 1 + .../java/org/apache/lucene/codecs/idversion/package-info.java | 1 + .../src/java/org/apache/lucene/payloads/package-info.java | 1 + .../java/org/apache/lucene/sandbox/queries/package-info.java | 1 + .../src/java/org/apache/lucene/spatial/bbox/package-info.java | 1 + .../java/org/apache/lucene/spatial/composite/package-info.java | 1 + .../src/java/org/apache/lucene/spatial/package-info.java | 1 + .../java/org/apache/lucene/spatial/prefix/package-info.java | 1 + .../org/apache/lucene/spatial/prefix/tree/package-info.java | 1 + .../src/java/org/apache/lucene/spatial/query/package-info.java | 1 + .../org/apache/lucene/spatial/serialized/package-info.java | 1 + .../java/org/apache/lucene/spatial/spatial4j/package-info.java | 1 + .../src/java/org/apache/lucene/spatial/util/package-info.java | 1 + .../java/org/apache/lucene/spatial/vector/package-info.java | 1 + .../src/java/org/apache/lucene/geo3d/package-info.java | 1 + .../src/java/org/apache/lucene/search/spell/package-info.java | 2 ++ .../apache/lucene/search/suggest/analyzing/package-info.java | 1 + .../apache/lucene/search/suggest/document/package-info.java | 1 + .../org/apache/lucene/search/suggest/fst/package-info.java | 1 + .../org/apache/lucene/search/suggest/jaspell/package-info.java | 1 + .../java/org/apache/lucene/search/suggest/package-info.java | 1 + .../org/apache/lucene/search/suggest/tst/package-info.java | 1 + .../java/org/apache/lucene/codecs/asserting/package-info.java | 1 + .../org/apache/lucene/codecs/cheapbastard/package-info.java | 1 + .../apache/lucene/codecs/compressing/dummy/package-info.java | 1 + .../src/java/org/apache/lucene/codecs/cranky/package-info.java | 1 + .../java/org/apache/lucene/codecs/mockrandom/package-info.java | 1 + .../java/org/apache/lucene/codecs/ramonly/package-info.java | 1 + .../src/java/org/apache/lucene/mockfile/package-info.java | 1 + .../apache/solr/analytics/accumulator/facet/package-info.java | 1 + .../org/apache/solr/analytics/accumulator/package-info.java | 1 + .../org/apache/solr/analytics/expression/package-info.java | 1 + .../java/org/apache/solr/analytics/plugin/package-info.java | 1 + .../java/org/apache/solr/analytics/request/package-info.java | 1 + .../org/apache/solr/analytics/statistics/package-info.java | 1 + .../src/java/org/apache/solr/analytics/util/package-info.java | 1 + .../apache/solr/analytics/util/valuesource/package-info.java | 1 + .../apache/solr/handler/clustering/carrot2/package-info.java | 1 + .../java/org/apache/solr/handler/clustering/package-info.java | 1 + .../apache/solr/handler/dataimport/config/package-info.java | 1 + .../java/org/apache/solr/handler/dataimport/package-info.java | 1 + .../java/org/apache/solr/handler/extraction/package-info.java | 1 + .../src/java/org/apache/solr/hadoop/dedup/package-info.java | 1 + .../java/org/apache/solr/hadoop/morphline/package-info.java | 1 + .../src/java/org/apache/solr/hadoop/package-info.java | 1 + .../src/java/org/apache/solr/morphlines/cell/package-info.java | 1 + .../src/java/org/apache/solr/morphlines/solr/package-info.java | 1 + .../src/java/org/apache/solr/uima/processor/package-info.java | 1 + solr/core/src/java/org/apache/solr/analysis/package-info.java | 1 + .../org/apache/solr/client/solrj/embedded/package-info.java | 1 + .../src/java/org/apache/solr/cloud/overseer/package-info.java | 1 + solr/core/src/java/org/apache/solr/cloud/package-info.java | 1 + .../core/src/java/org/apache/solr/cloud/rule/package-info.java | 1 + solr/core/src/java/org/apache/solr/core/package-info.java | 1 + .../src/java/org/apache/solr/handler/admin/package-info.java | 1 + .../java/org/apache/solr/handler/component/package-info.java | 1 + .../src/java/org/apache/solr/handler/loader/package-info.java | 1 + solr/core/src/java/org/apache/solr/handler/package-info.java | 1 + solr/core/src/java/org/apache/solr/highlight/package-info.java | 1 + .../core/src/java/org/apache/solr/index/hdfs/package-info.java | 1 + .../src/java/org/apache/solr/internal/csv/package-info.java | 1 + .../java/org/apache/solr/internal/csv/writer/package-info.java | 1 + .../src/java/org/apache/solr/logging/jul/package-info.java | 1 + .../src/java/org/apache/solr/logging/log4j/package-info.java | 1 + solr/core/src/java/org/apache/solr/logging/package-info.java | 1 + solr/core/src/java/org/apache/solr/package-info.java | 1 + solr/core/src/java/org/apache/solr/parser/package-info.java | 1 + solr/core/src/java/org/apache/solr/request/package-info.java | 1 + solr/core/src/java/org/apache/solr/response/package-info.java | 1 + .../java/org/apache/solr/response/transform/package-info.java | 1 + solr/core/src/java/org/apache/solr/rest/package-info.java | 1 + .../org/apache/solr/rest/schema/analysis/package-info.java | 1 + .../src/java/org/apache/solr/rest/schema/package-info.java | 1 + solr/core/src/java/org/apache/solr/schema/package-info.java | 1 + .../org/apache/solr/search/function/distance/package-info.java | 1 + .../src/java/org/apache/solr/search/function/package-info.java | 1 + .../apache/solr/search/grouping/collector/package-info.java | 1 + .../solr/search/grouping/distributed/command/package-info.java | 1 + .../apache/solr/search/grouping/distributed/package-info.java | 1 + .../grouping/distributed/requestfactory/package-info.java | 1 + .../grouping/distributed/responseprocessor/package-info.java | 1 + .../distributed/shardresultserializer/package-info.java | 1 + .../search/grouping/endresulttransformer/package-info.java | 1 + .../src/java/org/apache/solr/search/grouping/package-info.java | 1 + .../src/java/org/apache/solr/search/join/package-info.java | 1 + .../core/src/java/org/apache/solr/search/mlt/package-info.java | 1 + solr/core/src/java/org/apache/solr/search/package-info.java | 1 + .../java/org/apache/solr/search/similarities/package-info.java | 1 + .../src/java/org/apache/solr/search/stats/package-info.java | 1 + solr/core/src/java/org/apache/solr/security/package-info.java | 1 + .../src/java/org/apache/solr/servlet/cache/package-info.java | 1 + solr/core/src/java/org/apache/solr/servlet/package-info.java | 1 + solr/core/src/java/org/apache/solr/spelling/package-info.java | 1 + .../org/apache/solr/spelling/suggest/fst/package-info.java | 1 + .../org/apache/solr/spelling/suggest/jaspell/package-info.java | 1 + .../java/org/apache/solr/spelling/suggest/package-info.java | 1 + .../org/apache/solr/spelling/suggest/tst/package-info.java | 1 + .../java/org/apache/solr/store/blockcache/package-info.java | 1 + .../core/src/java/org/apache/solr/store/hdfs/package-info.java | 1 + solr/core/src/java/org/apache/solr/update/package-info.java | 1 + .../java/org/apache/solr/update/processor/package-info.java | 1 + solr/core/src/java/org/apache/solr/util/hll/package-info.java | 1 + solr/core/src/java/org/apache/solr/util/package-info.java | 1 + .../src/java/org/apache/solr/util/plugin/package-info.java | 1 + .../core/src/java/org/apache/solr/util/stats/package-info.java | 1 + solr/core/src/java/org/apache/solr/util/xslt/package-info.java | 1 + .../java/org/apache/solr/client/solrj/beans/package-info.java | 1 + .../java/org/apache/solr/client/solrj/impl/package-info.java | 1 + .../org/apache/solr/client/solrj/io/comp/package-info.java | 3 +++ .../java/org/apache/solr/client/solrj/io/eq/package-info.java | 1 + .../java/org/apache/solr/client/solrj/io/ops/package-info.java | 1 + .../src/java/org/apache/solr/client/solrj/io/package-info.java | 3 +++ .../java/org/apache/solr/client/solrj/io/sql/package-info.java | 1 + .../apache/solr/client/solrj/io/stream/expr/package-info.java | 3 +++ .../solr/client/solrj/io/stream/metrics/package-info.java | 3 +++ .../org/apache/solr/client/solrj/io/stream/package-info.java | 3 +++ .../src/java/org/apache/solr/client/solrj/package-info.java | 1 + .../org/apache/solr/client/solrj/request/package-info.java | 1 + .../apache/solr/client/solrj/request/schema/package-info.java | 1 + .../org/apache/solr/client/solrj/response/package-info.java | 1 + .../apache/solr/client/solrj/response/schema/package-info.java | 1 + .../java/org/apache/solr/client/solrj/util/package-info.java | 1 + .../src/java/org/apache/solr/common/cloud/package-info.java | 1 + .../src/java/org/apache/solr/common/luke/package-info.java | 1 + solr/solrj/src/java/org/apache/solr/common/package-info.java | 1 + .../src/java/org/apache/solr/common/params/package-info.java | 1 + .../src/java/org/apache/solr/common/util/package-info.java | 1 + 292 files changed, 306 insertions(+), 2 deletions(-) diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/package-info.java index 573812311ef..dfb2cab2dbd 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ar/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analyzer for Arabic. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/package-info.java index d4ffb240f77..c60a53bdf9a 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/bg/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analyzer for Bulgarian. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/package-info.java index 84b482fca1a..080389bda07 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/br/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analyzer for Brazilian Portuguese. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ca/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ca/package-info.java index fc1bb3ed5f2..7f8b0dad41d 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ca/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ca/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analyzer for Catalan. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/package-info.java index f6b043d4a17..12a43a5efdd 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Normalization of text before the tokenizer. *

    diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/package-info.java index f3e0036b410..2fd4ad45a7a 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analyzer for Chinese, Japanese, and Korean, which indexes bigrams. * This analyzer generates bigram terms, which are overlapping groups of two adjacent Han, Hiragana, Katakana, or Hangul characters. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/package-info.java index 74e8af8c828..5fccddfc7a4 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ckb/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analyzer for Sorani Kurdish. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/package-info.java index 282a638e1ff..4c9eaba28ab 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Construct n-grams for frequently occurring terms and phrases. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/package-info.java index b26ae8f1ae7..27de95181d7 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Hyphenation code for the CompoundWordTokenFilter. * The code for the compound word hyphenation is taken from the diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/package-info.java index c88dcc9a395..126f887f364 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/compound/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * A filter that decomposes compound words you find in many Germanic * languages into the word parts. This example shows what it does: diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/package-info.java index 61ec057d58c..7aba1e28cef 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/core/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Basic, general-purpose analysis components. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/custom/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/custom/package-info.java index 8b5cdedd523..9419282e4b5 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/custom/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/custom/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * A general-purpose Analyzer that can be created with a builder-style API. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/cz/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/cz/package-info.java index 70ae01f845e..92d5ffc701b 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/cz/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/cz/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analyzer for Czech. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/da/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/da/package-info.java index 38eb5f018f3..ff6eebb6c4d 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/da/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/da/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analyzer for Danish. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/package-info.java index fdaa4693a7f..ee37e347a1e 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/de/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analyzer for German. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/package-info.java index 228e88c5aee..ff3391e243c 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/el/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analyzer for Greek. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/package-info.java index 976f26915cf..be0f03752d6 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/en/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analyzer for English. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/es/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/es/package-info.java index 0048c81da81..316a2d1cf5f 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/es/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/es/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analyzer for Spanish. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/eu/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/eu/package-info.java index f34fd4503bf..869b6cbb843 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/eu/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/eu/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analyzer for Basque. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/package-info.java index 33769447dfb..b3d45074f80 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analyzer for Persian. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fi/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fi/package-info.java index 6628e2de167..e775cc9f263 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fi/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fi/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analyzer for Finnish. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/package-info.java index b45c25deac2..6e51ef343a4 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/fr/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analyzer for French. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ga/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ga/package-info.java index a3fd183f197..d6102e26cb4 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ga/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ga/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analyzer for Irish. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/package-info.java index 4e7076b2f3a..58d503da0c2 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/gl/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analyzer for Galician. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/package-info.java index d45e28a1813..e0e4e0c7692 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hi/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analyzer for Hindi. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hu/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hu/package-info.java index 3ac2e93d2ea..49f7c854cf6 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hu/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hu/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analyzer for Hungarian. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/package-info.java index b735ba0e735..56a79088a8b 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hunspell/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Stemming TokenFilter using a Java implementation of the * Hunspell stemming algorithm. diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hy/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hy/package-info.java index e03f10f2270..07747b6db05 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/hy/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/hy/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analyzer for Armenian. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/id/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/id/package-info.java index 9cd5fdb4d13..e94d99fd048 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/id/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/id/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analyzer for Indonesian. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/in/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/in/package-info.java index 063ab2faa09..eada97dc755 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/in/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/in/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analyzer for Indian languages. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/it/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/it/package-info.java index acf3e2a7de4..ff7dc7b6554 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/it/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/it/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analyzer for Italian. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/lt/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/lt/package-info.java index 3dc8f103d05..c01c039e3e7 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/lt/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/lt/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analyzer for Lithuanian. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/lv/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/lv/package-info.java index ca266867f00..ffeb9be0326 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/lv/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/lv/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analyzer for Latvian. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/package-info.java index 297d1a54c29..200ed6fb75f 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Miscellaneous Tokenstreams. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/package-info.java index 2884eb5a093..3571be258b6 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ngram/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Character n-gram tokenizers and filters. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/nl/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/nl/package-info.java index cc622ad4734..e62f8c78b23 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/nl/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/nl/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analyzer for Dutch. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/package-info.java index 386f8f5e5fd..9d162ca5fd6 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/no/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analyzer for Norwegian. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/path/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/path/package-info.java index 70d52627272..0482a7f8121 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/path/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/path/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analysis components for path-like strings such as filenames. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/package-info.java index 8b3dd82335e..e9d49cfafa6 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Set of components for pattern-based (regex) analysis. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/package-info.java index 411d1e48b96..f7b77318030 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/payloads/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Provides various convenience classes for creating payloads on Tokens. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/package-info.java index e352eb32e31..1f8caa960f6 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/pt/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analyzer for Portuguese. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/query/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/query/package-info.java index c4cd7ab914c..11b89a4bd8e 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/query/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/query/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Automatically filter high-frequency stopwords. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/reverse/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/reverse/package-info.java index 2e636494131..d0b46f8a3bb 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/reverse/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/reverse/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Filter to reverse token text. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ro/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ro/package-info.java index 7e340fdae5d..9b7426bd0b0 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ro/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ro/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analyzer for Romanian. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ru/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ru/package-info.java index 5901307272f..597b80f3ec4 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/ru/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/ru/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analyzer for Russian. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/package-info.java index 625bea35e72..b90b982e940 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/shingle/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Word n-gram filters. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/sinks/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/sinks/package-info.java index a222837b7a8..964e5f43aaa 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/sinks/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/sinks/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * {@link org.apache.lucene.analysis.sinks.TeeSinkTokenFilter}. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/snowball/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/snowball/package-info.java index 7ad67d1a82d..c01d6f195b5 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/snowball/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/snowball/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * {@link org.apache.lucene.analysis.TokenFilter} and {@link * org.apache.lucene.analysis.Analyzer} implementations that use Snowball diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/sr/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/sr/package-info.java index f900abb3f86..b67d83f8625 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/sr/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/sr/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analyzer for Serbian. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/package-info.java index 7c45b4bb772..afc68ce973f 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Fast, general-purpose grammar-based tokenizers. *

    The org.apache.lucene.analysis.standard package contains three diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/sv/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/sv/package-info.java index 06c8f300def..1a10b3c2ab8 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/sv/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/sv/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analyzer for Swedish. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/package-info.java index af1a145c711..a8b33c2193f 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/synonym/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analysis components for Synonyms. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/package-info.java index 9f55c1c922c..74dcc7740a8 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/th/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analyzer for Thai. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/package-info.java index 44e70fe129a..564ef0c441a 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/tr/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analyzer for Turkish. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/package-info.java index a2afac8475e..771ddf3e77b 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/util/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Utility functions for text analysis. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/package-info.java index 1bfb36ac247..65708d80e09 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/wikipedia/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Tokenizer that is aware of Wikipedia syntax. */ diff --git a/lucene/analysis/common/src/java/org/apache/lucene/collation/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/collation/package-info.java index e7c248f2f6f..19a1c7ecd6d 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/collation/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/collation/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Unicode collation support. *

    diff --git a/lucene/analysis/common/src/java/org/apache/lucene/collation/tokenattributes/package-info.java b/lucene/analysis/common/src/java/org/apache/lucene/collation/tokenattributes/package-info.java index 14742a239b3..eee13c4f74e 100644 --- a/lucene/analysis/common/src/java/org/apache/lucene/collation/tokenattributes/package-info.java +++ b/lucene/analysis/common/src/java/org/apache/lucene/collation/tokenattributes/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Custom {@link org.apache.lucene.util.AttributeImpl} for indexing collation keys as index terms. */ diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/package-info.java b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/package-info.java index 64bb5c1a3ac..6d2d43b83e3 100644 --- a/lucene/analysis/common/src/java/org/tartarus/snowball/ext/package-info.java +++ b/lucene/analysis/common/src/java/org/tartarus/snowball/ext/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Autogenerated snowball stemmer implementations. */ diff --git a/lucene/analysis/common/src/java/org/tartarus/snowball/package-info.java b/lucene/analysis/common/src/java/org/tartarus/snowball/package-info.java index 2e31343b79e..b335dc1b1dc 100644 --- a/lucene/analysis/common/src/java/org/tartarus/snowball/package-info.java +++ b/lucene/analysis/common/src/java/org/tartarus/snowball/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Snowball stemmer API */ diff --git a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/package-info.java b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/package-info.java index 239b5748bf6..a396db4d561 100644 --- a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/package-info.java +++ b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analysis components based on ICU */ diff --git a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/package-info.java b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/package-info.java index 6d61333ae4d..81c904f9c15 100644 --- a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/package-info.java +++ b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Tokenizer that breaks text into words with the Unicode Text Segmentation algorithm. */ diff --git a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/tokenattributes/package-info.java b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/tokenattributes/package-info.java index cecd9d34ec9..d600eb3d21f 100644 --- a/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/tokenattributes/package-info.java +++ b/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/tokenattributes/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Additional ICU-specific Attributes for text analysis. */ diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/package-info.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/package-info.java index ef3bd10957a..284c2d6cfa6 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/package-info.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/dict/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Kuromoji dictionary implementation. */ diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/package-info.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/package-info.java index 692ad2c4b8b..b000563953b 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/package-info.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analyzer for Japanese. */ diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/package-info.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/package-info.java index 7ff68262d09..932871d386b 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/package-info.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/tokenattributes/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Additional Kuromoji-specific Attributes for text analysis. */ diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/package-info.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/package-info.java index d3ae36573ec..28558b3d4f9 100644 --- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/package-info.java +++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/util/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Kuromoji utility classes. */ diff --git a/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/package-info.java b/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/package-info.java index a828fdebc95..9d58e1d44d1 100644 --- a/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/package-info.java +++ b/lucene/analysis/morfologik/src/java/org/apache/lucene/analysis/morfologik/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * This package provides dictionary-driven lemmatization ("accurate stemming") * filter and analyzer for the Polish Language, driven by the diff --git a/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/package-info.java b/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/package-info.java index 5aa2535a941..c710c9880b1 100644 --- a/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/package-info.java +++ b/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analysis components for phonetic search. */ diff --git a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/package-info.java b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/package-info.java index 55ea61169b3..37d38b04ed1 100644 --- a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/package-info.java +++ b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * SmartChineseAnalyzer Hidden Markov Model package. * @lucene.experimental diff --git a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/package-info.java b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/package-info.java index a365e1b76f1..d273a363922 100644 --- a/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/package-info.java +++ b/lucene/analysis/smartcn/src/java/org/apache/lucene/analysis/cn/smart/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analyzer for Simplified Chinese, which indexes words. * @lucene.experimental diff --git a/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/pl/package-info.java b/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/pl/package-info.java index 733dda4e460..6a6cc80acb2 100644 --- a/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/pl/package-info.java +++ b/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/pl/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analyzer for Polish. */ diff --git a/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/package-info.java b/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/package-info.java index 855a7f8c449..db125cd8d75 100644 --- a/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/package-info.java +++ b/lucene/analysis/stempel/src/java/org/apache/lucene/analysis/stempel/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Stempel: Algorithmic Stemmer */ diff --git a/lucene/analysis/stempel/src/java/org/egothor/stemmer/package-info.java b/lucene/analysis/stempel/src/java/org/egothor/stemmer/package-info.java index f60c1f74d08..395aa659d13 100644 --- a/lucene/analysis/stempel/src/java/org/egothor/stemmer/package-info.java +++ b/lucene/analysis/stempel/src/java/org/egothor/stemmer/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Egothor stemmer API. */ diff --git a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/package-info.java b/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/package-info.java index f883099e96f..e08da29bbb6 100644 --- a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/package-info.java +++ b/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/ae/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Integration with UIMA's AnalysisEngine. */ diff --git a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/package-info.java b/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/package-info.java index ffa5b48c367..0baa0fc8530 100644 --- a/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/package-info.java +++ b/lucene/analysis/uima/src/java/org/apache/lucene/analysis/uima/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Classes that integrate UIMA with Lucene's analysis API. */ diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/package-info.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/package-info.java index 17f8830bf10..8df0337404f 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/package-info.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Sources for benchmark inputs: documents and queries. */ diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/package-info.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/package-info.java index 430810bbde9..465557aba5b 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/package-info.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Benchmarking Lucene By Tasks *

    diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/programmatic/package-info.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/programmatic/package-info.java index ecc741386dd..d9dfd44ff9b 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/programmatic/package-info.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/programmatic/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Sample performance test written programmatically - no algorithm file is needed here. */ diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/package-info.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/package-info.java index f32e8476388..2bc0751b405 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/package-info.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Statistics maintained when running benchmark tasks. */ diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/package-info.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/package-info.java index c7446cbde51..d06f4848a72 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/package-info.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Extendable benchmark tasks. */ diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/package-info.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/package-info.java index 57d188cbad4..4066a7a98af 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/package-info.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Utilities used for the benchmark, and for the reports. */ diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/package-info.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/package-info.java index ec90d751475..2df570b12ad 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/package-info.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Lucene Benchmarking Package *

    diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/package-info.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/package-info.java index df1428bd31f..de19b3c5bec 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/package-info.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Search Quality Benchmarking. *

    diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/package-info.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/package-info.java index 052290aa32d..45ddec80a5c 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/package-info.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Utilities for Trec related quality benchmarking, feeding from Trec Topics and QRels inputs. */ diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/package-info.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/package-info.java index 1aa19b9f5b0..56d721d4dca 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/package-info.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Miscellaneous utilities for search quality benchmarking: query parsing, submission reports. */ diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/utils/package-info.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/utils/package-info.java index 287e206057c..956b84fa927 100644 --- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/utils/package-info.java +++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/utils/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Benchmark Utility functions. */ diff --git a/lucene/classification/src/java/org/apache/lucene/classification/document/package-info.java b/lucene/classification/src/java/org/apache/lucene/classification/document/package-info.java index 69d9c30b971..34ea098ac3e 100644 --- a/lucene/classification/src/java/org/apache/lucene/classification/document/package-info.java +++ b/lucene/classification/src/java/org/apache/lucene/classification/document/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Uses already seen data (the indexed documents) to classify new documents. * diff --git a/lucene/classification/src/java/org/apache/lucene/classification/package-info.java b/lucene/classification/src/java/org/apache/lucene/classification/package-info.java index fa05f5af43a..abb3acffbdf 100644 --- a/lucene/classification/src/java/org/apache/lucene/classification/package-info.java +++ b/lucene/classification/src/java/org/apache/lucene/classification/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Uses already seen data (the indexed documents) to classify an input ( can be simple text or a structured document). * diff --git a/lucene/classification/src/java/org/apache/lucene/classification/utils/package-info.java b/lucene/classification/src/java/org/apache/lucene/classification/utils/package-info.java index 857276750b7..d510e093c2c 100644 --- a/lucene/classification/src/java/org/apache/lucene/classification/utils/package-info.java +++ b/lucene/classification/src/java/org/apache/lucene/classification/utils/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Utilities for evaluation, data preparation, etc. */ diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/autoprefix/package-info.java b/lucene/codecs/src/java/org/apache/lucene/codecs/autoprefix/package-info.java index 90758b0a3e8..b15f2fad7b2 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/autoprefix/package-info.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/autoprefix/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * An experimental postings format that automatically indexes appropriate * prefix terms for fast range and prefix queries. diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/package-info.java b/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/package-info.java index 67368a11010..3317f0a09e9 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/package-info.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Pluggable term index / block terms dictionary implementations. */ diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/package-info.java b/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/package-info.java index e3cd1b5df5e..57f7e38649c 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/package-info.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Same postings format as Lucene50, except the terms dictionary also * supports ords, i.e. returning which ord the enum is seeked to, and diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/package-info.java b/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/package-info.java index c1f5084d3f8..9080ae664e7 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/package-info.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Codec PostingsFormat for fast access to low-frequency terms * such as primary key fields. diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/package-info.java b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/package-info.java index d03f8767f3f..fadc94a391d 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/memory/package-info.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/memory/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Term dictionary, DocValues or Postings formats that are read * entirely into memory. diff --git a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/package-info.java b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/package-info.java index c49e8cd0225..812a93c0867 100644 --- a/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/package-info.java +++ b/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Simpletext Codec: writes human readable postings. */ diff --git a/lucene/core/src/java/org/apache/lucene/analysis/package-info.java b/lucene/core/src/java/org/apache/lucene/analysis/package-info.java index 4a74866352f..511f26822e7 100644 --- a/lucene/core/src/java/org/apache/lucene/analysis/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Text analysis. *

    API and code to convert text into indexable/searchable tokens. Covers {@link org.apache.lucene.analysis.Analyzer} and related classes.

    diff --git a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/package-info.java b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/package-info.java index ab85ec66f6d..7ad002982d5 100644 --- a/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * General-purpose attributes for text analysis. */ diff --git a/lucene/core/src/java/org/apache/lucene/codecs/blocktree/package-info.java b/lucene/core/src/java/org/apache/lucene/codecs/blocktree/package-info.java index 4678778ef1e..9cdbb02a790 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/blocktree/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/blocktree/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * BlockTree terms dictionary. * diff --git a/lucene/core/src/java/org/apache/lucene/codecs/compressing/package-info.java b/lucene/core/src/java/org/apache/lucene/codecs/compressing/package-info.java index 189de336ed5..9d3ce937326 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/compressing/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/compressing/package-info.java @@ -13,7 +13,8 @@ * 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. - */ + */ + /** * StoredFieldsFormat that allows cross-document and cross-field compression of stored fields. */ diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene50/package-info.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene50/package-info.java index 3cf6d0d13bc..f76ac06392e 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/lucene50/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene50/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Components from the Lucene 5.0 index format * See {@link org.apache.lucene.codecs.lucene53} for an overview diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene53/package-info.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene53/package-info.java index 9f7b2c476a5..6a035323cd3 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/lucene53/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene53/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Components from the Lucene 5.3 index format * See {@link org.apache.lucene.codecs.lucene54} for an overview diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene54/package-info.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene54/package-info.java index 5874f571bad..ebae8491bc2 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/lucene54/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene54/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Lucene 5.4 file format. * diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene60/package-info.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene60/package-info.java index 6ec8f547ff9..a52d6f6ad21 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/lucene60/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene60/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Lucene 6.0 file format. * diff --git a/lucene/core/src/java/org/apache/lucene/codecs/package-info.java b/lucene/core/src/java/org/apache/lucene/codecs/package-info.java index 0d950507048..28b260da498 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Codecs API: API for customization of the encoding and structure of the index. * diff --git a/lucene/core/src/java/org/apache/lucene/codecs/perfield/package-info.java b/lucene/core/src/java/org/apache/lucene/codecs/perfield/package-info.java index 7a04bc7dd9c..4c0faa09ab7 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/perfield/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/perfield/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Postings format that can delegate to different formats per-field. */ diff --git a/lucene/core/src/java/org/apache/lucene/document/package-info.java b/lucene/core/src/java/org/apache/lucene/document/package-info.java index d2a14e7dac5..f3e8e5bcfae 100644 --- a/lucene/core/src/java/org/apache/lucene/document/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/document/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * The logical representation of a {@link org.apache.lucene.document.Document} for indexing and searching. *

    The document package provides the user level logical representation of content to be indexed and searched. The diff --git a/lucene/core/src/java/org/apache/lucene/index/package-info.java b/lucene/core/src/java/org/apache/lucene/index/package-info.java index 787560c05b1..f5a86d1cb37 100644 --- a/lucene/core/src/java/org/apache/lucene/index/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/index/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Code to maintain and access indices. * diff --git a/lucene/core/src/java/org/apache/lucene/package-info.java b/lucene/core/src/java/org/apache/lucene/package-info.java index 70709d804fe..0e6eedded81 100644 --- a/lucene/core/src/java/org/apache/lucene/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/package-info.java @@ -13,7 +13,8 @@ * 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. - */ + */ + /** * Top-level package. */ diff --git a/lucene/core/src/java/org/apache/lucene/search/package-info.java b/lucene/core/src/java/org/apache/lucene/search/package-info.java index b52c8f9ba72..27f7d551346 100644 --- a/lucene/core/src/java/org/apache/lucene/search/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/search/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Code to search indices. * diff --git a/lucene/core/src/java/org/apache/lucene/search/similarities/package-info.java b/lucene/core/src/java/org/apache/lucene/search/similarities/package-info.java index 6a0ecc4d98c..a3544d71442 100644 --- a/lucene/core/src/java/org/apache/lucene/search/similarities/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/search/similarities/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * This package contains the various ranking models that can be used in Lucene. The * abstract class {@link org.apache.lucene.search.similarities.Similarity} serves diff --git a/lucene/core/src/java/org/apache/lucene/search/spans/package-info.java b/lucene/core/src/java/org/apache/lucene/search/spans/package-info.java index 971db762d61..4fc88d3bc98 100644 --- a/lucene/core/src/java/org/apache/lucene/search/spans/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/search/spans/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * The calculus of spans. * diff --git a/lucene/core/src/java/org/apache/lucene/store/package-info.java b/lucene/core/src/java/org/apache/lucene/store/package-info.java index f4b66bfcd1a..048a0a865eb 100644 --- a/lucene/core/src/java/org/apache/lucene/store/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/store/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Binary i/o API, used for all index data. */ diff --git a/lucene/core/src/java/org/apache/lucene/util/bkd/package-info.java b/lucene/core/src/java/org/apache/lucene/util/bkd/package-info.java index d824ffebe98..85dec5a3d20 100644 --- a/lucene/core/src/java/org/apache/lucene/util/bkd/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/util/bkd/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Block KD-tree, implementing the generic spatial data structure described in * this paper. diff --git a/lucene/core/src/java/org/apache/lucene/util/fst/package-info.java b/lucene/core/src/java/org/apache/lucene/util/fst/package-info.java index 9fd4084780c..41426f96426 100644 --- a/lucene/core/src/java/org/apache/lucene/util/fst/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/util/fst/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Finite state transducers *

    diff --git a/lucene/core/src/java/org/apache/lucene/util/mutable/package-info.java b/lucene/core/src/java/org/apache/lucene/util/mutable/package-info.java index 15077eff11c..02ae5fcd686 100644 --- a/lucene/core/src/java/org/apache/lucene/util/mutable/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/util/mutable/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Comparable object wrappers */ diff --git a/lucene/core/src/java/org/apache/lucene/util/package-info.java b/lucene/core/src/java/org/apache/lucene/util/package-info.java index 66f4a107613..be74639322a 100644 --- a/lucene/core/src/java/org/apache/lucene/util/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/util/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Some utility classes. */ diff --git a/lucene/core/src/java/org/apache/lucene/util/packed/package-info.java b/lucene/core/src/java/org/apache/lucene/util/packed/package-info.java index cb6554c0f8c..0365f772f55 100644 --- a/lucene/core/src/java/org/apache/lucene/util/packed/package-info.java +++ b/lucene/core/src/java/org/apache/lucene/util/packed/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Packed integer arrays and streams. * diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/package-info.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/package-info.java index 4252e0ebc6c..af74d23e2a1 100644 --- a/lucene/demo/src/java/org/apache/lucene/demo/facet/package-info.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Facets example code. */ diff --git a/lucene/demo/src/java/org/apache/lucene/demo/package-info.java b/lucene/demo/src/java/org/apache/lucene/demo/package-info.java index e78e3f0626c..77f76dd3ed2 100644 --- a/lucene/demo/src/java/org/apache/lucene/demo/package-info.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Demo applications for indexing and searching. */ diff --git a/lucene/demo/src/java/org/apache/lucene/demo/xmlparser/package-info.java b/lucene/demo/src/java/org/apache/lucene/demo/xmlparser/package-info.java index adf284e38a3..0b569dcff1c 100644 --- a/lucene/demo/src/java/org/apache/lucene/demo/xmlparser/package-info.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/xmlparser/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Demo servlet for the XML Query Parser. */ diff --git a/lucene/expressions/src/java/org/apache/lucene/expressions/js/package-info.java b/lucene/expressions/src/java/org/apache/lucene/expressions/js/package-info.java index b58994ffc2d..3aa543a6f60 100644 --- a/lucene/expressions/src/java/org/apache/lucene/expressions/js/package-info.java +++ b/lucene/expressions/src/java/org/apache/lucene/expressions/js/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Javascript expressions. *

    A Javascript expression is a numeric expression specified using an expression syntax that's based on JavaScript expressions. You can construct expressions using:

    diff --git a/lucene/expressions/src/java/org/apache/lucene/expressions/package-info.java b/lucene/expressions/src/java/org/apache/lucene/expressions/package-info.java index 77c8b9945da..62a519b4c20 100644 --- a/lucene/expressions/src/java/org/apache/lucene/expressions/package-info.java +++ b/lucene/expressions/src/java/org/apache/lucene/expressions/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Expressions. *

    diff --git a/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/package-info.java b/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/package-info.java index ce2558235eb..73588ce2463 100644 --- a/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/package-info.java +++ b/lucene/grouping/src/java/org/apache/lucene/search/grouping/function/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Support for grouping by {@link org.apache.lucene.queries.function.ValueSource}. */ diff --git a/lucene/grouping/src/java/org/apache/lucene/search/grouping/package-info.java b/lucene/grouping/src/java/org/apache/lucene/search/grouping/package-info.java index 3af4adfe66b..824a98e31bf 100644 --- a/lucene/grouping/src/java/org/apache/lucene/search/grouping/package-info.java +++ b/lucene/grouping/src/java/org/apache/lucene/search/grouping/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Grouping. *

    diff --git a/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/package-info.java b/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/package-info.java index 7965ecaa80b..27320118d7c 100644 --- a/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/package-info.java +++ b/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Support for grouping by indexed terms via {@link org.apache.lucene.index.DocValues}. */ diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/package-info.java b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/package-info.java index 5648759a29d..a435ff5111e 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/highlight/package-info.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/highlight/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Highlighting search terms. *

    diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/package-info.java b/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/package-info.java index 33e752019e9..10013c2cd6c 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/package-info.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/postingshighlight/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Highlighter implementation that uses offsets from postings lists. */ diff --git a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/package-info.java b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/package-info.java index 2784714a922..39d0f5d5441 100644 --- a/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/package-info.java +++ b/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Another highlighter implementation based on term vectors. * diff --git a/lucene/join/src/java/org/apache/lucene/search/join/package-info.java b/lucene/join/src/java/org/apache/lucene/search/join/package-info.java index 6b22185491a..6133f99748f 100644 --- a/lucene/join/src/java/org/apache/lucene/search/join/package-info.java +++ b/lucene/join/src/java/org/apache/lucene/search/join/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Support for index-time and query-time joins. *

    Index-time joins

    diff --git a/lucene/memory/src/java/org/apache/lucene/index/memory/package-info.java b/lucene/memory/src/java/org/apache/lucene/index/memory/package-info.java index f606a547949..c0a17d60ef2 100644 --- a/lucene/memory/src/java/org/apache/lucene/index/memory/package-info.java +++ b/lucene/memory/src/java/org/apache/lucene/index/memory/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * High-performance single-document main memory Apache Lucene fulltext search index. */ diff --git a/lucene/misc/src/java/org/apache/lucene/misc/package-info.java b/lucene/misc/src/java/org/apache/lucene/misc/package-info.java index 94a21335572..6067a6e54aa 100644 --- a/lucene/misc/src/java/org/apache/lucene/misc/package-info.java +++ b/lucene/misc/src/java/org/apache/lucene/misc/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Miscellaneous index tools. */ diff --git a/lucene/misc/src/java/org/apache/lucene/uninverting/package-info.java b/lucene/misc/src/java/org/apache/lucene/uninverting/package-info.java index 73dddcf2816..a4e8521d04a 100644 --- a/lucene/misc/src/java/org/apache/lucene/uninverting/package-info.java +++ b/lucene/misc/src/java/org/apache/lucene/uninverting/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Support for creating docvalues on-the-fly from the inverted index at runtime. */ diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/docvalues/package-info.java b/lucene/queries/src/java/org/apache/lucene/queries/function/docvalues/package-info.java index 5be042a7a7a..da7fe26c9de 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/docvalues/package-info.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/docvalues/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * FunctionValues for different data types. */ diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/package-info.java b/lucene/queries/src/java/org/apache/lucene/queries/function/package-info.java index 88403bacb1f..cd4459053de 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/package-info.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Queries that compute score based upon a function. */ diff --git a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/package-info.java b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/package-info.java index 64066ec140a..e57c647cb40 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/package-info.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * A variety of functions to use with FunctionQuery. */ diff --git a/lucene/queries/src/java/org/apache/lucene/queries/mlt/package-info.java b/lucene/queries/src/java/org/apache/lucene/queries/mlt/package-info.java index 851ff4fccc1..e4f00a3d2e3 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/mlt/package-info.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/mlt/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Document similarity query generators. */ diff --git a/lucene/queries/src/java/org/apache/lucene/queries/package-info.java b/lucene/queries/src/java/org/apache/lucene/queries/package-info.java index 6e00780f89c..49b22e58daf 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/package-info.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Filters and Queries that add to core Lucene. */ diff --git a/lucene/queries/src/java/org/apache/lucene/queries/payloads/package-info.java b/lucene/queries/src/java/org/apache/lucene/queries/payloads/package-info.java index ae24e233d85..1eb61e582ee 100644 --- a/lucene/queries/src/java/org/apache/lucene/queries/payloads/package-info.java +++ b/lucene/queries/src/java/org/apache/lucene/queries/payloads/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * The payloads package provides Query mechanisms for finding and using payloads. *

    diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/analyzing/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/analyzing/package-info.java index afd74c5b723..77397b45cbf 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/analyzing/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/analyzing/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * QueryParser that passes Fuzzy-, Prefix-, Range-, and WildcardQuerys through the given analyzer. */ diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/package-info.java index 5770d1b3fe1..ab3451f65b0 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/package-info.java @@ -14,6 +14,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + + /** * A simple query parser implemented with JavaCC. * diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/complexPhrase/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/complexPhrase/package-info.java index 8c684ee1fbb..fbe1ccec679 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/complexPhrase/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/complexPhrase/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * QueryParser which permits complex phrase query syntax eg "(john jon jonathan~) peters*" */ diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/ext/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/ext/package-info.java index 00a5010083e..a5e9000c77f 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/ext/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/ext/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Extendable QueryParser provides a simple and flexible extension mechanism by overloading query field names. */ diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/builders/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/builders/package-info.java index 8881b4319c5..d24c915ca9e 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/builders/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/builders/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Necessary classes to implement query builders. * diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/package-info.java index cc3b8787ad3..f3719e984d7 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/config/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Base classes used to configure the query processing. * diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/messages/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/messages/package-info.java index 149125225f4..75fbb21997e 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/messages/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/messages/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Messages usually used by query parser implementations. * diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/package-info.java index a4f8f6e7b5b..c9d55eab12c 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Query nodes commonly used by query parser implementations. * diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/package-info.java index 869fdc8197b..dd8c4cd63ca 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Core classes of the flexible query parser framework. * diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/parser/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/parser/package-info.java index 3359d77178d..273138d8762 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/parser/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/parser/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Necessary interfaces to implement text parsers. * diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/package-info.java index 74f2de63cb0..86ce57b5d99 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/processors/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Interfaces and implementations used by query node processors * diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/util/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/util/package-info.java index a5748b70c2f..d5f8e5b16e1 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/util/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/util/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Utility classes to used with the Query Parser. *

    Utility classes to used with the Query Parser

    diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/package-info.java index 6046ff566de..07cef021112 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/messages/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * For Native Language Support (NLS), system of software internationalization. * diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/precedence/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/precedence/package-info.java index d0398ab433c..2d46676ec12 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/precedence/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/precedence/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Precedence Query Parser Implementation * diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/package-info.java index 844165c7d2b..2d950107da5 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Standard Lucene Query Node Builders. * diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/package-info.java index 8d86637f80d..6f06e796936 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Standard Lucene Query Configuration. * diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/package-info.java index de903123c4b..0a9b75a0177 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/nodes/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Standard Lucene Query Nodes. * diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/package-info.java index 49e4caf2647..740ca4c2cee 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Implementation of the {@linkplain org.apache.lucene.queryparser.classic Lucene classic query parser} using the flexible query parser frameworks * diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/package-info.java index ff0f78b0ba4..be72e7f57a3 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** *

    Lucene Query Parser

    *

    diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/package-info.java index 63be1552640..ec68c7ef975 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Lucene Query Node Processors. * diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/simple/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/simple/package-info.java index 2217329e42e..926ed1795d5 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/simple/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/simple/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * A simple query parser for human-entered queries. */ diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/package-info.java index 6bdfecb760a..78a8e71b794 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/parser/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * This package contains the QueryParser.jj source file for the Surround parser. *

    diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/package-info.java index da9926dcc7b..d0c7fae8c0e 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * This package contains SrndQuery and its subclasses. *

    diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/package-info.java index f252786d052..0d570fb86ae 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * XML Parser factories for different Lucene Query/Filters. */ diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/package-info.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/package-info.java index 107ac9aca02..2b1abee54f3 100644 --- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/package-info.java +++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Parser that produces Lucene Query objects from XML streams. */ diff --git a/lucene/replicator/src/java/org/apache/lucene/replicator/http/package-info.java b/lucene/replicator/src/java/org/apache/lucene/replicator/http/package-info.java index acad49b1781..b4769c2d8cb 100644 --- a/lucene/replicator/src/java/org/apache/lucene/replicator/http/package-info.java +++ b/lucene/replicator/src/java/org/apache/lucene/replicator/http/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * HTTP replication implementation */ diff --git a/lucene/replicator/src/java/org/apache/lucene/replicator/package-info.java b/lucene/replicator/src/java/org/apache/lucene/replicator/package-info.java index 4ecc3e7c836..869447ff565 100644 --- a/lucene/replicator/src/java/org/apache/lucene/replicator/package-info.java +++ b/lucene/replicator/src/java/org/apache/lucene/replicator/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** *

    Files replication framework

    * diff --git a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/package-info.java b/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/package-info.java index cccb9a6f642..43c3ec2cec0 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/package-info.java +++ b/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * A primary-key postings format that associates a version (long) with each term and * can provide fail-fast lookups by ID and version. diff --git a/lucene/sandbox/src/java/org/apache/lucene/payloads/package-info.java b/lucene/sandbox/src/java/org/apache/lucene/payloads/package-info.java index a42da0cd289..b2a6bb3ad32 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/payloads/package-info.java +++ b/lucene/sandbox/src/java/org/apache/lucene/payloads/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Experimental classes for interacting with payloads */ diff --git a/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/package-info.java b/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/package-info.java index 7766b8a2498..499403fad8c 100644 --- a/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/package-info.java +++ b/lucene/sandbox/src/java/org/apache/lucene/sandbox/queries/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Additional queries (some may have caveats or limitations) */ diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/package-info.java b/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/package-info.java index 19e9fd3cd57..c19529f2f11 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/package-info.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Bounding Box Spatial Strategy *

    diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/composite/package-info.java b/lucene/spatial/src/java/org/apache/lucene/spatial/composite/package-info.java index 04cb9fc8b22..c207ea6b293 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/composite/package-info.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/composite/package-info.java @@ -14,5 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** Composite strategies. */ package org.apache.lucene.spatial.composite; \ No newline at end of file diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/package-info.java b/lucene/spatial/src/java/org/apache/lucene/spatial/package-info.java index 8a4b1d1da6e..9e768b6efe8 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/package-info.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Lucene spatial search */ diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/package-info.java b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/package-info.java index 656c474e965..dcccdc3e6d5 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/package-info.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Prefix Tree Strategy. */ diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/package-info.java b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/package-info.java index c1419ad9b19..4dd85b12826 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/package-info.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/tree/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * This package is about SpatialPrefixTree and any supporting classes. * A SpatialPrefixTree supports spatial indexing by index-time tokens diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/query/package-info.java b/lucene/spatial/src/java/org/apache/lucene/spatial/query/package-info.java index 75ee6809014..42a5036b411 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/query/package-info.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/query/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Spatial Query options useful for client side requests */ diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/serialized/package-info.java b/lucene/spatial/src/java/org/apache/lucene/spatial/serialized/package-info.java index 353dcdd22b7..7a316d9d461 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/serialized/package-info.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/serialized/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Strategies that serialize the shape (non-indexed). */ diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/package-info.java b/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/package-info.java index f4585c89fbc..7815318b530 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/package-info.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/spatial4j/package-info.java @@ -14,5 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** Spatial4j stuff that ideally belongs in Spatial4j (isn't related to Lucene). */ package org.apache.lucene.spatial.spatial4j; \ No newline at end of file diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/util/package-info.java b/lucene/spatial/src/java/org/apache/lucene/spatial/util/package-info.java index 39c3c40139e..3d14591ebd7 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/util/package-info.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/util/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Various spatial utilities. */ diff --git a/lucene/spatial/src/java/org/apache/lucene/spatial/vector/package-info.java b/lucene/spatial/src/java/org/apache/lucene/spatial/vector/package-info.java index 47c208cbc51..990f8bdc909 100644 --- a/lucene/spatial/src/java/org/apache/lucene/spatial/vector/package-info.java +++ b/lucene/spatial/src/java/org/apache/lucene/spatial/vector/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Spatial strategy that uses two fields. */ diff --git a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/package-info.java b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/package-info.java index 4b45d3d933a..2b6af740b51 100644 --- a/lucene/spatial3d/src/java/org/apache/lucene/geo3d/package-info.java +++ b/lucene/spatial3d/src/java/org/apache/lucene/geo3d/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Shapes implemented using 3D planar geometry. */ diff --git a/lucene/suggest/src/java/org/apache/lucene/search/spell/package-info.java b/lucene/suggest/src/java/org/apache/lucene/search/spell/package-info.java index f730bdfc537..bae3d298bbf 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/spell/package-info.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/spell/package-info.java @@ -14,6 +14,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + + /** * Suggest alternate spellings for words. * Also see the spell checker Wiki page. diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/package-info.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/package-info.java index 7b8c90c04b3..3ac2442babc 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/package-info.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analyzer based autosuggest. */ diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/package-info.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/package-info.java index 063f6c453e3..33025644102 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/package-info.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Support for document suggestion */ diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/package-info.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/package-info.java index 0d7c9b6225b..24b0b4e63f4 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/package-info.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Finite-state based autosuggest. */ diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/package-info.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/package-info.java index 6ea7b7a36f5..bd074afcc10 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/package-info.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * JaSpell-based autosuggest. */ diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/package-info.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/package-info.java index bad2d9a8a54..a80b317201c 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/package-info.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Support for Autocomplete/Autosuggest */ diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/tst/package-info.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/tst/package-info.java index 2fe7d38251d..b136dce7caf 100644 --- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/tst/package-info.java +++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/tst/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Ternary Search Tree based autosuggest. */ diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/package-info.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/package-info.java index 5429818eeb9..bccdd5d4bf6 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/package-info.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Codec for testing that asserts various contracts of the codec apis. */ diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/cheapbastard/package-info.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/cheapbastard/package-info.java index e559eabbadf..f9d245ef58b 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/cheapbastard/package-info.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/cheapbastard/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Codec that unreasonably tries to use as little RAM as possible. * For testing, benchmarking, API purposes only! diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/dummy/package-info.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/dummy/package-info.java index cf831c08318..f8fcbdfd55e 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/dummy/package-info.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/compressing/dummy/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Dummy CompressingCodec implementation used for testing. */ diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/package-info.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/package-info.java index cd6c6228aed..676beacc4d3 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/package-info.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Codec for testing that throws random IOExceptions */ diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/mockrandom/package-info.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/mockrandom/package-info.java index 8635f1681c9..8a755e46273 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/mockrandom/package-info.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/mockrandom/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Frankenstein codec for testing that pieces together random components. */ diff --git a/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/package-info.java b/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/package-info.java index fbfd2f0e715..8ea282fa3a6 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/package-info.java +++ b/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Codec for testing that never writes to disk. */ diff --git a/lucene/test-framework/src/java/org/apache/lucene/mockfile/package-info.java b/lucene/test-framework/src/java/org/apache/lucene/mockfile/package-info.java index 5272b6d67df..a7bdcaea974 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/mockfile/package-info.java +++ b/lucene/test-framework/src/java/org/apache/lucene/mockfile/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Support for testing/debugging with virtual filesystems *

    diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/facet/package-info.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/facet/package-info.java index 3f19c07ad83..3daf103f1b5 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/facet/package-info.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/facet/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Accumulators for accumulating over differnt types of facets diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/package-info.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/package-info.java index 8af50648762..0abe00a1ff9 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/package-info.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/accumulator/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Accumulators accumulate values over different types of strucuture (eg result, facet, etc..) */ diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/expression/package-info.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/expression/package-info.java index b279d3a0b99..8c6f70ece86 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/expression/package-info.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/expression/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Expressions map either zero, one, two or many inputs to a single value. They can be defined recursively to compute complex math. */ diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/plugin/package-info.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/plugin/package-info.java index ac77d70f678..3496b12216d 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/plugin/package-info.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/plugin/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * MBean plugins for stats collection */ diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/package-info.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/package-info.java index c28836b64ce..de2feb3816f 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/package-info.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/request/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Request objects for creating Analytics requests */ diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/package-info.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/package-info.java index 31b0e04eedd..90fa12da88f 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/package-info.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/statistics/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Statistics collectors reduce a list of Objects to a single value. Most implementations reduce a list to a statistic on that list. */ diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/package-info.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/package-info.java index 89b60595db9..a5676f19590 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/package-info.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Utilities used by analytics component */ diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/package-info.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/package-info.java index c2d5b958a73..72a23d28c08 100644 --- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/package-info.java +++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * ValueSource function/sources used by analytics component */ diff --git a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/package-info.java b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/package-info.java index 58ab0fd6576..6d0d49b7d64 100644 --- a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/package-info.java +++ b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * {@link org.apache.solr.handler.clustering.carrot2.CarrotClusteringEngine} and related classes for use in the {@link org.apache.solr.handler.clustering.ClusteringComponent}. */ diff --git a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/package-info.java b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/package-info.java index 41333bad12c..25cca338821 100644 --- a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/package-info.java +++ b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * {@link org.apache.solr.handler.clustering.ClusteringComponent} and common APIs for specific implementations. diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/package-info.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/package-info.java index e5caac0d23e..50c6d4eab7c 100644 --- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/package-info.java +++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Utility classes for parsing & modeling DIH configuration. */ diff --git a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/package-info.java b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/package-info.java index 79c52dcf224..4a69d23c569 100644 --- a/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/package-info.java +++ b/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * {@link org.apache.solr.handler.dataimport.DataImportHandler} and related code. */ diff --git a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/package-info.java b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/package-info.java index deaa1326bc3..729a2767964 100644 --- a/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/package-info.java +++ b/solr/contrib/extraction/src/java/org/apache/solr/handler/extraction/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * {@link org.apache.solr.handler.extraction.ExtractingRequestHandler} and related code. */ diff --git a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/dedup/package-info.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/dedup/package-info.java index bdd1a8694b6..a021282654a 100644 --- a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/dedup/package-info.java +++ b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/dedup/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Dedupe related code. */ diff --git a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/morphline/package-info.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/morphline/package-info.java index 309f2554d27..c754f79e338 100644 --- a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/morphline/package-info.java +++ b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/morphline/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Morphlines related code. */ diff --git a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/package-info.java b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/package-info.java index b49671b7334..043a150e935 100644 --- a/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/package-info.java +++ b/solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * {@link org.apache.solr.hadoop.MapReduceIndexerTool} and related code. */ diff --git a/solr/contrib/morphlines-cell/src/java/org/apache/solr/morphlines/cell/package-info.java b/solr/contrib/morphlines-cell/src/java/org/apache/solr/morphlines/cell/package-info.java index 4197bcc9545..0f44a70488d 100644 --- a/solr/contrib/morphlines-cell/src/java/org/apache/solr/morphlines/cell/package-info.java +++ b/solr/contrib/morphlines-cell/src/java/org/apache/solr/morphlines/cell/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Morphlines Solr Cell related code. */ diff --git a/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/package-info.java b/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/package-info.java index da27bd2513b..f4b91eca57c 100644 --- a/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/package-info.java +++ b/solr/contrib/morphlines-core/src/java/org/apache/solr/morphlines/solr/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Morphlines Solr related code. */ diff --git a/solr/contrib/uima/src/java/org/apache/solr/uima/processor/package-info.java b/solr/contrib/uima/src/java/org/apache/solr/uima/processor/package-info.java index 65d66e5f9d3..4525c33c23e 100644 --- a/solr/contrib/uima/src/java/org/apache/solr/uima/processor/package-info.java +++ b/solr/contrib/uima/src/java/org/apache/solr/uima/processor/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * {@link org.apache.solr.uima.processor.UIMAUpdateRequestProcessorFactory} and related code. */ diff --git a/solr/core/src/java/org/apache/solr/analysis/package-info.java b/solr/core/src/java/org/apache/solr/analysis/package-info.java index 5b0fe9a800a..e8a48bff739 100644 --- a/solr/core/src/java/org/apache/solr/analysis/package-info.java +++ b/solr/core/src/java/org/apache/solr/analysis/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Factories and classes specific to text analysis and the creation of {@link org.apache.lucene.analysis.TokenStream}s *

    diff --git a/solr/core/src/java/org/apache/solr/client/solrj/embedded/package-info.java b/solr/core/src/java/org/apache/solr/client/solrj/embedded/package-info.java index f1a256d41fa..a74c7458a57 100644 --- a/solr/core/src/java/org/apache/solr/client/solrj/embedded/package-info.java +++ b/solr/core/src/java/org/apache/solr/client/solrj/embedded/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * SolrJ client implementations for embedded solr access. *

    diff --git a/solr/core/src/java/org/apache/solr/cloud/overseer/package-info.java b/solr/core/src/java/org/apache/solr/cloud/overseer/package-info.java index d74ba9288d4..dbd3b1d6a79 100644 --- a/solr/core/src/java/org/apache/solr/cloud/overseer/package-info.java +++ b/solr/core/src/java/org/apache/solr/cloud/overseer/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Classes for updating cluster state in SolrCloud mode. */ diff --git a/solr/core/src/java/org/apache/solr/cloud/package-info.java b/solr/core/src/java/org/apache/solr/cloud/package-info.java index 5c830c70334..096d6faaa55 100644 --- a/solr/core/src/java/org/apache/solr/cloud/package-info.java +++ b/solr/core/src/java/org/apache/solr/cloud/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Classes for dealing with ZooKeeper when operating in SolrCloud mode. */ diff --git a/solr/core/src/java/org/apache/solr/cloud/rule/package-info.java b/solr/core/src/java/org/apache/solr/cloud/rule/package-info.java index b650a6005e0..f4f0dd05fcc 100644 --- a/solr/core/src/java/org/apache/solr/cloud/rule/package-info.java +++ b/solr/core/src/java/org/apache/solr/cloud/rule/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Classes for managing Replica placement strategy when operating in SolrCloud mode. */ diff --git a/solr/core/src/java/org/apache/solr/core/package-info.java b/solr/core/src/java/org/apache/solr/core/package-info.java index b80f2725da7..6fd201f5268 100644 --- a/solr/core/src/java/org/apache/solr/core/package-info.java +++ b/solr/core/src/java/org/apache/solr/core/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Core classes implementin Solr internals and the management of {@link org.apache.solr.core.SolrCore}s */ diff --git a/solr/core/src/java/org/apache/solr/handler/admin/package-info.java b/solr/core/src/java/org/apache/solr/handler/admin/package-info.java index c0a6eee2ed3..bce6448f987 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/package-info.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * {@link org.apache.solr.request.SolrRequestHandler} implementations for powering he Solr Admin UI */ diff --git a/solr/core/src/java/org/apache/solr/handler/component/package-info.java b/solr/core/src/java/org/apache/solr/handler/component/package-info.java index 9fba06423bb..6bfde58f5bc 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/package-info.java +++ b/solr/core/src/java/org/apache/solr/handler/component/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * {@link org.apache.solr.handler.component.SearchComponent} implementations for * use in {@link org.apache.solr.handler.component.SearchHandler} diff --git a/solr/core/src/java/org/apache/solr/handler/loader/package-info.java b/solr/core/src/java/org/apache/solr/handler/loader/package-info.java index 77b9e809c23..8d4f54577e3 100644 --- a/solr/core/src/java/org/apache/solr/handler/loader/package-info.java +++ b/solr/core/src/java/org/apache/solr/handler/loader/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * {@link org.apache.solr.handler.loader.ContentStreamLoader} implementations for * use in {@link org.apache.solr.handler.ContentStreamHandlerBase} implementations diff --git a/solr/core/src/java/org/apache/solr/handler/package-info.java b/solr/core/src/java/org/apache/solr/handler/package-info.java index c3b49f2a90c..8a3d0ea5db2 100644 --- a/solr/core/src/java/org/apache/solr/handler/package-info.java +++ b/solr/core/src/java/org/apache/solr/handler/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Concrete implementations of {@link org.apache.solr.request.SolrRequestHandler} */ diff --git a/solr/core/src/java/org/apache/solr/highlight/package-info.java b/solr/core/src/java/org/apache/solr/highlight/package-info.java index e8de8a267b7..fda20833f3f 100644 --- a/solr/core/src/java/org/apache/solr/highlight/package-info.java +++ b/solr/core/src/java/org/apache/solr/highlight/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * {@link org.apache.solr.highlight.SolrHighlighter} API and related implementaions and utilities *

    diff --git a/solr/core/src/java/org/apache/solr/index/hdfs/package-info.java b/solr/core/src/java/org/apache/solr/index/hdfs/package-info.java index ddf41176d98..9b23898a181 100644 --- a/solr/core/src/java/org/apache/solr/index/hdfs/package-info.java +++ b/solr/core/src/java/org/apache/solr/index/hdfs/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * An HDFS CheckIndex implementation. */ diff --git a/solr/core/src/java/org/apache/solr/internal/csv/package-info.java b/solr/core/src/java/org/apache/solr/internal/csv/package-info.java index bc4d6a598b1..9f5e794de39 100644 --- a/solr/core/src/java/org/apache/solr/internal/csv/package-info.java +++ b/solr/core/src/java/org/apache/solr/internal/csv/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Internal classes used for reading/writing CSV */ diff --git a/solr/core/src/java/org/apache/solr/internal/csv/writer/package-info.java b/solr/core/src/java/org/apache/solr/internal/csv/writer/package-info.java index 89fcf5dd7ec..932b8f00c47 100644 --- a/solr/core/src/java/org/apache/solr/internal/csv/writer/package-info.java +++ b/solr/core/src/java/org/apache/solr/internal/csv/writer/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Internal classes used for reading/writing CSV */ diff --git a/solr/core/src/java/org/apache/solr/logging/jul/package-info.java b/solr/core/src/java/org/apache/solr/logging/jul/package-info.java index 9dc4c95a87f..138b5d70da2 100644 --- a/solr/core/src/java/org/apache/solr/logging/jul/package-info.java +++ b/solr/core/src/java/org/apache/solr/logging/jul/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * JUL based implementation of {@link org.apache.solr.logging.LogWatcher} */ diff --git a/solr/core/src/java/org/apache/solr/logging/log4j/package-info.java b/solr/core/src/java/org/apache/solr/logging/log4j/package-info.java index c897abe71ab..f78953385cd 100644 --- a/solr/core/src/java/org/apache/solr/logging/log4j/package-info.java +++ b/solr/core/src/java/org/apache/solr/logging/log4j/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Log4j based implementation of {@link org.apache.solr.logging.LogWatcher} */ diff --git a/solr/core/src/java/org/apache/solr/logging/package-info.java b/solr/core/src/java/org/apache/solr/logging/package-info.java index dae89d547fe..fc7380976f2 100644 --- a/solr/core/src/java/org/apache/solr/logging/package-info.java +++ b/solr/core/src/java/org/apache/solr/logging/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * APIs related to capturing log event info in the {@link org.apache.solr.handler.admin.LoggingHandler} */ diff --git a/solr/core/src/java/org/apache/solr/package-info.java b/solr/core/src/java/org/apache/solr/package-info.java index 1609526e0dd..38cd6fe6b6c 100644 --- a/solr/core/src/java/org/apache/solr/package-info.java +++ b/solr/core/src/java/org/apache/solr/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Commonly reused classes and interfaces (deprecated package, do not add new classes) */ diff --git a/solr/core/src/java/org/apache/solr/parser/package-info.java b/solr/core/src/java/org/apache/solr/parser/package-info.java index 11304ea5bf3..aaadc129770 100644 --- a/solr/core/src/java/org/apache/solr/parser/package-info.java +++ b/solr/core/src/java/org/apache/solr/parser/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Solr native variant of the {@linkplain org.apache.lucene.queryparser.classic.QueryParser Lucene Classic QueryParser} */ diff --git a/solr/core/src/java/org/apache/solr/request/package-info.java b/solr/core/src/java/org/apache/solr/request/package-info.java index 5c11f00f31e..a75bda59dba 100644 --- a/solr/core/src/java/org/apache/solr/request/package-info.java +++ b/solr/core/src/java/org/apache/solr/request/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * APIs and classes for dealing with Solr requests */ diff --git a/solr/core/src/java/org/apache/solr/response/package-info.java b/solr/core/src/java/org/apache/solr/response/package-info.java index ed89f5d44ce..6b4bd2c6fed 100644 --- a/solr/core/src/java/org/apache/solr/response/package-info.java +++ b/solr/core/src/java/org/apache/solr/response/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * API and implementations of {@link org.apache.solr.response.QueryResponseWriter} for formating Solr request responses */ diff --git a/solr/core/src/java/org/apache/solr/response/transform/package-info.java b/solr/core/src/java/org/apache/solr/response/transform/package-info.java index 50e3939d4c0..7b48f3646ed 100644 --- a/solr/core/src/java/org/apache/solr/response/transform/package-info.java +++ b/solr/core/src/java/org/apache/solr/response/transform/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * APIs and implementations of {@link org.apache.solr.response.transform.DocTransformer} for modifying documents in Solr request responses */ diff --git a/solr/core/src/java/org/apache/solr/rest/package-info.java b/solr/core/src/java/org/apache/solr/rest/package-info.java index f6ae8756c2f..b903928ee4e 100644 --- a/solr/core/src/java/org/apache/solr/rest/package-info.java +++ b/solr/core/src/java/org/apache/solr/rest/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Solr RESTful APIs via Restlet. */ diff --git a/solr/core/src/java/org/apache/solr/rest/schema/analysis/package-info.java b/solr/core/src/java/org/apache/solr/rest/schema/analysis/package-info.java index dc152d2c364..04d4428c3e6 100644 --- a/solr/core/src/java/org/apache/solr/rest/schema/analysis/package-info.java +++ b/solr/core/src/java/org/apache/solr/rest/schema/analysis/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Analysis-related functionality for RESTful API access to the Solr Schema using Restlet. */ diff --git a/solr/core/src/java/org/apache/solr/rest/schema/package-info.java b/solr/core/src/java/org/apache/solr/rest/schema/package-info.java index 5b47e692472..ca5fd2c6312 100644 --- a/solr/core/src/java/org/apache/solr/rest/schema/package-info.java +++ b/solr/core/src/java/org/apache/solr/rest/schema/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Provides RESTful API access to the Solr Schema using Restlet. */ diff --git a/solr/core/src/java/org/apache/solr/schema/package-info.java b/solr/core/src/java/org/apache/solr/schema/package-info.java index ba77af6013d..83d7ede7ce4 100644 --- a/solr/core/src/java/org/apache/solr/schema/package-info.java +++ b/solr/core/src/java/org/apache/solr/schema/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * {@link org.apache.solr.schema.IndexSchema} and {@link org.apache.solr.schema.FieldType} implementations for powering schema.xml diff --git a/solr/core/src/java/org/apache/solr/search/function/distance/package-info.java b/solr/core/src/java/org/apache/solr/search/function/distance/package-info.java index 1024bf80745..8f584cfdec5 100644 --- a/solr/core/src/java/org/apache/solr/search/function/distance/package-info.java +++ b/solr/core/src/java/org/apache/solr/search/function/distance/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Solr implementations of {@link org.apache.lucene.queries.function.ValueSource} for distance based function queries. diff --git a/solr/core/src/java/org/apache/solr/search/function/package-info.java b/solr/core/src/java/org/apache/solr/search/function/package-info.java index b3acb6cd35c..0d3c3e2b274 100644 --- a/solr/core/src/java/org/apache/solr/search/function/package-info.java +++ b/solr/core/src/java/org/apache/solr/search/function/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Solr implementations of {@link org.apache.lucene.queries.function.ValueSource} for function queries. diff --git a/solr/core/src/java/org/apache/solr/search/grouping/collector/package-info.java b/solr/core/src/java/org/apache/solr/search/grouping/collector/package-info.java index 1f5b71c1d38..782d5c61d48 100644 --- a/solr/core/src/java/org/apache/solr/search/grouping/collector/package-info.java +++ b/solr/core/src/java/org/apache/solr/search/grouping/collector/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Grouping related {@link org.apache.lucene.search.Collector}s */ diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/package-info.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/package-info.java index 7fb7261cac8..4714bf41f41 100644 --- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/package-info.java +++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Internal classes used to implement distributed result grouping */ diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/package-info.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/package-info.java index f688a0a9580..53180fc2d63 100644 --- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/package-info.java +++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Internal classes used to implement distributed result grouping */ diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/package-info.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/package-info.java index fd4d4ebb274..737223007cb 100644 --- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/package-info.java +++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Internal classes used to implement distributed result grouping */ diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/package-info.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/package-info.java index 0aa38a3ce0b..8f662ad12df 100644 --- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/package-info.java +++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Internal classes used to implement distributed result grouping */ diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/package-info.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/package-info.java index 92a7786b01c..965bd6e02fc 100644 --- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/package-info.java +++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Internal classes used to implement distributed result grouping */ diff --git a/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/package-info.java b/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/package-info.java index df9894792ea..4cde5a2252a 100644 --- a/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/package-info.java +++ b/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * APIs and classes for transforming result grouping results into the appropriate response format diff --git a/solr/core/src/java/org/apache/solr/search/grouping/package-info.java b/solr/core/src/java/org/apache/solr/search/grouping/package-info.java index 10bab490694..ee0555ff8ec 100644 --- a/solr/core/src/java/org/apache/solr/search/grouping/package-info.java +++ b/solr/core/src/java/org/apache/solr/search/grouping/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * APIs and classes for implementing result grouping *

    diff --git a/solr/core/src/java/org/apache/solr/search/join/package-info.java b/solr/core/src/java/org/apache/solr/search/join/package-info.java index dac62790e24..972856f8a10 100644 --- a/solr/core/src/java/org/apache/solr/search/join/package-info.java +++ b/solr/core/src/java/org/apache/solr/search/join/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Classes related to joins. */ diff --git a/solr/core/src/java/org/apache/solr/search/mlt/package-info.java b/solr/core/src/java/org/apache/solr/search/mlt/package-info.java index e50afe19c8b..22ea63936f5 100644 --- a/solr/core/src/java/org/apache/solr/search/mlt/package-info.java +++ b/solr/core/src/java/org/apache/solr/search/mlt/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * APIs and classes for implementing MoreLikeThis (mlt) QueryParser. */ diff --git a/solr/core/src/java/org/apache/solr/search/package-info.java b/solr/core/src/java/org/apache/solr/search/package-info.java index b49cd6c8680..67940b6a179 100644 --- a/solr/core/src/java/org/apache/solr/search/package-info.java +++ b/solr/core/src/java/org/apache/solr/search/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * APIs and classes for {@linkplain org.apache.solr.search.QParserPlugin parsing} and {@linkplain org.apache.solr.search.SolrIndexSearcher processing} search requests */ diff --git a/solr/core/src/java/org/apache/solr/search/similarities/package-info.java b/solr/core/src/java/org/apache/solr/search/similarities/package-info.java index d6b02e5d7ec..560a7d95cc4 100644 --- a/solr/core/src/java/org/apache/solr/search/similarities/package-info.java +++ b/solr/core/src/java/org/apache/solr/search/similarities/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Factories for various built-in Lucene ranking models. *

    diff --git a/solr/core/src/java/org/apache/solr/search/stats/package-info.java b/solr/core/src/java/org/apache/solr/search/stats/package-info.java index 287c05fd2df..8b3df6c1469 100644 --- a/solr/core/src/java/org/apache/solr/search/stats/package-info.java +++ b/solr/core/src/java/org/apache/solr/search/stats/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * APIs and Classes implementing the Stats component used for document frequency * calculations. diff --git a/solr/core/src/java/org/apache/solr/security/package-info.java b/solr/core/src/java/org/apache/solr/security/package-info.java index 3db6e739faf..8a6fead5f65 100644 --- a/solr/core/src/java/org/apache/solr/security/package-info.java +++ b/solr/core/src/java/org/apache/solr/security/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Commonly used classes for Solr security framework. */ diff --git a/solr/core/src/java/org/apache/solr/servlet/cache/package-info.java b/solr/core/src/java/org/apache/solr/servlet/cache/package-info.java index d05f1b78d1d..53bf070ff8a 100644 --- a/solr/core/src/java/org/apache/solr/servlet/cache/package-info.java +++ b/solr/core/src/java/org/apache/solr/servlet/cache/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Caching related classes used in the Solr HTTP API */ diff --git a/solr/core/src/java/org/apache/solr/servlet/package-info.java b/solr/core/src/java/org/apache/solr/servlet/package-info.java index eea59935bef..1fb8016b61b 100644 --- a/solr/core/src/java/org/apache/solr/servlet/package-info.java +++ b/solr/core/src/java/org/apache/solr/servlet/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Servlet related classes for powering the Solr HTTP API */ diff --git a/solr/core/src/java/org/apache/solr/spelling/package-info.java b/solr/core/src/java/org/apache/solr/spelling/package-info.java index 7411ebc01df..f21ac313e7b 100644 --- a/solr/core/src/java/org/apache/solr/spelling/package-info.java +++ b/solr/core/src/java/org/apache/solr/spelling/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * APIs and classes used by the {@link org.apache.solr.handler.component.SpellCheckComponent} *

    diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/fst/package-info.java b/solr/core/src/java/org/apache/solr/spelling/suggest/fst/package-info.java index 9a509e65a23..0943b37eb7c 100644 --- a/solr/core/src/java/org/apache/solr/spelling/suggest/fst/package-info.java +++ b/solr/core/src/java/org/apache/solr/spelling/suggest/fst/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Factories for {@linkplain org.apache.lucene.search.suggest.fst FST} and {@linkplain org.apache.lucene.search.suggest.analyzing Analyzing} based {@link org.apache.solr.spelling.suggest.Suggester}s */ diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/jaspell/package-info.java b/solr/core/src/java/org/apache/solr/spelling/suggest/jaspell/package-info.java index f3ad70e79b8..569fe8e5fc0 100644 --- a/solr/core/src/java/org/apache/solr/spelling/suggest/jaspell/package-info.java +++ b/solr/core/src/java/org/apache/solr/spelling/suggest/jaspell/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Factories for {@linkplain org.apache.lucene.search.suggest.jaspell JaSpell} based {@link org.apache.solr.spelling.suggest.Suggester}s */ diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/package-info.java b/solr/core/src/java/org/apache/solr/spelling/suggest/package-info.java index ae4ce1018c5..9b96e63feea 100644 --- a/solr/core/src/java/org/apache/solr/spelling/suggest/package-info.java +++ b/solr/core/src/java/org/apache/solr/spelling/suggest/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * APIs and classes used by the {@link org.apache.solr.handler.component.SpellCheckComponent} *

    diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/tst/package-info.java b/solr/core/src/java/org/apache/solr/spelling/suggest/tst/package-info.java index f930f473fcf..a30041575f7 100644 --- a/solr/core/src/java/org/apache/solr/spelling/suggest/tst/package-info.java +++ b/solr/core/src/java/org/apache/solr/spelling/suggest/tst/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Factories for {@linkplain org.apache.lucene.search.suggest.tst TST} based {@link org.apache.solr.spelling.suggest.Suggester}s */ diff --git a/solr/core/src/java/org/apache/solr/store/blockcache/package-info.java b/solr/core/src/java/org/apache/solr/store/blockcache/package-info.java index f75b4bf0fbb..6da8bb33305 100644 --- a/solr/core/src/java/org/apache/solr/store/blockcache/package-info.java +++ b/solr/core/src/java/org/apache/solr/store/blockcache/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * An HDFS blockcache implementation. */ diff --git a/solr/core/src/java/org/apache/solr/store/hdfs/package-info.java b/solr/core/src/java/org/apache/solr/store/hdfs/package-info.java index 78ae0bcee7b..5064bcd0198 100644 --- a/solr/core/src/java/org/apache/solr/store/hdfs/package-info.java +++ b/solr/core/src/java/org/apache/solr/store/hdfs/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * An HDFS Directory implementation. */ diff --git a/solr/core/src/java/org/apache/solr/update/package-info.java b/solr/core/src/java/org/apache/solr/update/package-info.java index 2e2d6ab67d6..f7832232e72 100644 --- a/solr/core/src/java/org/apache/solr/update/package-info.java +++ b/solr/core/src/java/org/apache/solr/update/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * APIs and classes for managing index updates */ diff --git a/solr/core/src/java/org/apache/solr/update/processor/package-info.java b/solr/core/src/java/org/apache/solr/update/processor/package-info.java index 3751d35371c..ab20391e6f6 100644 --- a/solr/core/src/java/org/apache/solr/update/processor/package-info.java +++ b/solr/core/src/java/org/apache/solr/update/processor/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * {@link org.apache.solr.update.processor.UpdateRequestProcessorFactory} APIs and implementations for use in {@link org.apache.solr.update.processor.UpdateRequestProcessorChain}s diff --git a/solr/core/src/java/org/apache/solr/util/hll/package-info.java b/solr/core/src/java/org/apache/solr/util/hll/package-info.java index 4a75a756eaf..040b84e7c5b 100644 --- a/solr/core/src/java/org/apache/solr/util/hll/package-info.java +++ b/solr/core/src/java/org/apache/solr/util/hll/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * A fork of Java-HyperLogLog package tweaked * not to depend on fastutil and with cleanups to make it lean and clean. diff --git a/solr/core/src/java/org/apache/solr/util/package-info.java b/solr/core/src/java/org/apache/solr/util/package-info.java index e5c9756b270..fc6232bdc03 100644 --- a/solr/core/src/java/org/apache/solr/util/package-info.java +++ b/solr/core/src/java/org/apache/solr/util/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Common utility classes used throughout Solr */ diff --git a/solr/core/src/java/org/apache/solr/util/plugin/package-info.java b/solr/core/src/java/org/apache/solr/util/plugin/package-info.java index b202fbf272d..e0e3a435972 100644 --- a/solr/core/src/java/org/apache/solr/util/plugin/package-info.java +++ b/solr/core/src/java/org/apache/solr/util/plugin/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Common APIs related to implementing Solr plugins *

    diff --git a/solr/core/src/java/org/apache/solr/util/stats/package-info.java b/solr/core/src/java/org/apache/solr/util/stats/package-info.java index 78761af430c..5b55c70296e 100644 --- a/solr/core/src/java/org/apache/solr/util/stats/package-info.java +++ b/solr/core/src/java/org/apache/solr/util/stats/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Utilities for collecting statistics */ diff --git a/solr/core/src/java/org/apache/solr/util/xslt/package-info.java b/solr/core/src/java/org/apache/solr/util/xslt/package-info.java index d859ec87b65..488386cfa75 100644 --- a/solr/core/src/java/org/apache/solr/util/xslt/package-info.java +++ b/solr/core/src/java/org/apache/solr/util/xslt/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * XSLT related utilities (deprecated package, do not add new classes) */ diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/beans/package-info.java b/solr/solrj/src/java/org/apache/solr/client/solrj/beans/package-info.java index be93515dca0..890005f82df 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/beans/package-info.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/beans/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Annotation based mapping of client objects to Solr documents. */ diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/package-info.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/package-info.java index f3a1fe5f900..491ef057ec1 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/package-info.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Concrete implementations of client API classes. diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/package-info.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/package-info.java index 07e83dfe94d..6420c54a1a7 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/package-info.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/package-info.java @@ -14,6 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + + + /** * Comparators for the Streaming Aggregation API **/ diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eq/package-info.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eq/package-info.java index 7b3cc55b9da..fd525ded618 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eq/package-info.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eq/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Equalitors for the Streaming Aggregation API **/ diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/package-info.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/package-info.java index b063a3d3629..0e9ffd08129 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/package-info.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/ops/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Operations for the Streaming Aggregation API **/ diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/package-info.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/package-info.java index 281088419c2..5be9c12a182 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/package-info.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/package-info.java @@ -14,6 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + + + /** * Streaming Aggregation API **/ diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/package-info.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/package-info.java index bba2366c058..cce60be012e 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/package-info.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * JDBC Driver Package * diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/package-info.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/package-info.java index 35c2b532918..8c21dd586c4 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/package-info.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/package-info.java @@ -14,6 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + + + /** * Expression language for the Streaming Aggregation API **/ diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/package-info.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/package-info.java index 50f4f8e158e..a25732e9a2f 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/package-info.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/metrics/package-info.java @@ -14,6 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + + + /** * Metrics package **/ diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/package-info.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/package-info.java index 3dec906ec05..92a60344058 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/package-info.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/package-info.java @@ -14,6 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + + + /** * Stream implementations for the Streaming Aggregation API **/ diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/package-info.java b/solr/solrj/src/java/org/apache/solr/client/solrj/package-info.java index b0980950ddd..70a83dd76e2 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/package-info.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Primary APIs for communicating with a Solr Server from a Java client. **/ diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/package-info.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/package-info.java index 44693343c0c..899a562783f 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/package-info.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Convenience classes for dealing with various types of Solr requests. */ diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/schema/package-info.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/schema/package-info.java index ce7a916505b..874d16b1ce9 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/schema/package-info.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/schema/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Convenience classes for making Schema API requests. *

    diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/package-info.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/package-info.java index 3583f6a0cc2..e2bbe3aa3e4 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/package-info.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Convenience classes for dealing with various types of Solr responses. diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/schema/package-info.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/schema/package-info.java index 0f6f258a324..fe55e040fd2 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/schema/package-info.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/schema/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Convenience classes for dealing with Schema API responses. *

    diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/util/package-info.java b/solr/solrj/src/java/org/apache/solr/client/solrj/util/package-info.java index ee1db5f23a2..9464970719d 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/util/package-info.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/util/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Utilities for Solr client applications. */ diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/package-info.java b/solr/solrj/src/java/org/apache/solr/common/cloud/package-info.java index 3ec3585b007..04ef67c60dd 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/package-info.java +++ b/solr/solrj/src/java/org/apache/solr/common/cloud/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Common Solr Cloud and ZooKeeper related classes reused on both clients & server. */ diff --git a/solr/solrj/src/java/org/apache/solr/common/luke/package-info.java b/solr/solrj/src/java/org/apache/solr/common/luke/package-info.java index 7603d064a68..e710d39bc8a 100644 --- a/solr/solrj/src/java/org/apache/solr/common/luke/package-info.java +++ b/solr/solrj/src/java/org/apache/solr/common/luke/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Common constants used by the LukeRequestHandler. */ diff --git a/solr/solrj/src/java/org/apache/solr/common/package-info.java b/solr/solrj/src/java/org/apache/solr/common/package-info.java index b69f377b0a2..690a83c257d 100644 --- a/solr/solrj/src/java/org/apache/solr/common/package-info.java +++ b/solr/solrj/src/java/org/apache/solr/common/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Common classes reused on both clients & server for dealing with {@link org.apache.solr.common.SolrInputDocument documents to be indexed} and {@link org.apache.solr.common.SolrDocumentList result documents}. */ diff --git a/solr/solrj/src/java/org/apache/solr/common/params/package-info.java b/solr/solrj/src/java/org/apache/solr/common/params/package-info.java index 43558e6cd71..94622cc74fc 100644 --- a/solr/solrj/src/java/org/apache/solr/common/params/package-info.java +++ b/solr/solrj/src/java/org/apache/solr/common/params/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Parameter constants and enumerations. */ diff --git a/solr/solrj/src/java/org/apache/solr/common/util/package-info.java b/solr/solrj/src/java/org/apache/solr/common/util/package-info.java index 116b6cebba9..1da825fa9e5 100644 --- a/solr/solrj/src/java/org/apache/solr/common/util/package-info.java +++ b/solr/solrj/src/java/org/apache/solr/common/util/package-info.java @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Common utility classes reused on both clients & server. */ From ec4c72310f3548b93139b25a12d6e9a16ac9e322 Mon Sep 17 00:00:00 2001 From: Mark Miller Date: Thu, 4 Feb 2016 17:54:01 -0500 Subject: [PATCH 11/12] SOLR-8575: Fix HDFSLogReader replay status numbers and a performance bug where we can reopen FSDataInputStream too often. --- solr/CHANGES.txt | 2 + .../solr/update/HdfsTransactionLog.java | 22 +-- .../org/apache/solr/update/UpdateLog.java | 2 +- .../TlogReplayBufferedWhileIndexingTest.java | 136 ++++++++++++++++++ ...fsTlogReplayBufferedWhileIndexingTest.java | 63 ++++++++ 5 files changed, 213 insertions(+), 12 deletions(-) create mode 100644 solr/core/src/test/org/apache/solr/cloud/TlogReplayBufferedWhileIndexingTest.java create mode 100644 solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsTlogReplayBufferedWhileIndexingTest.java diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index c396d393873..348cf017373 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -445,6 +445,8 @@ Bug Fixes * SOLR-8607: The Schema API refuses to add new fields that match existing dynamic fields. (Jan Høydahl, Steve Rowe) +* SOLR-8575: Fix HDFSLogReader replay status numbers and a performance bug where we can reopen + FSDataInputStream too often. (Mark Miller, Patrick Dvorack) Optimizations ---------------------- diff --git a/solr/core/src/java/org/apache/solr/update/HdfsTransactionLog.java b/solr/core/src/java/org/apache/solr/update/HdfsTransactionLog.java index 3db65c61887..bff3486b213 100644 --- a/solr/core/src/java/org/apache/solr/update/HdfsTransactionLog.java +++ b/solr/core/src/java/org/apache/solr/update/HdfsTransactionLog.java @@ -390,16 +390,18 @@ public class HdfsTransactionLog extends TransactionLog { // we actually need a new reader to // see if any data was added by the writer - if (fis.position() >= sz) { + if (pos >= sz) { + log.info("Read available inputstream data, opening new inputstream pos={} sz={}", pos, sz); + + synchronized (HdfsTransactionLog.this) { + sz = fos.size(); + } + fis.close(); tlogOutStream.hflush(); - try { - FSDataInputStream fdis = fs.open(tlogFile); - fis = new FSDataFastInputStream(fdis, pos); - sz = fs.getFileStatus(tlogFile).getLen(); - } catch (IOException e) { - throw new RuntimeException(e); - } + + FSDataInputStream fdis = fs.open(tlogFile); + fis = new FSDataFastInputStream(fdis, pos); } if (pos == 0) { @@ -446,7 +448,7 @@ public class HdfsTransactionLog extends TransactionLog { @Override public long currentSize() { - return sz; + return fos.size(); } } @@ -604,5 +606,3 @@ class FSDataFastInputStream extends FastInputStream { return "readFromStream="+readFromStream +" pos="+pos +" end="+end + " bufferPos="+getBufferPos() + " position="+position() ; } } - - diff --git a/solr/core/src/java/org/apache/solr/update/UpdateLog.java b/solr/core/src/java/org/apache/solr/update/UpdateLog.java index 78c30b95d29..214d9a50d0e 100644 --- a/solr/core/src/java/org/apache/solr/update/UpdateLog.java +++ b/solr/core/src/java/org/apache/solr/update/UpdateLog.java @@ -1324,7 +1324,7 @@ public class UpdateLog implements PluginInfoInitialized { loglog.info( "log replay status {} active={} starting pos={} current pos={} current size={} % read={}", translog, activeLog, recoveryInfo.positionOfStart, cpos, csize, - Math.round(cpos / (double) csize * 100.)); + Math.floor(cpos / (double) csize * 100.)); } } diff --git a/solr/core/src/test/org/apache/solr/cloud/TlogReplayBufferedWhileIndexingTest.java b/solr/core/src/test/org/apache/solr/cloud/TlogReplayBufferedWhileIndexingTest.java new file mode 100644 index 00000000000..5c03a6093d9 --- /dev/null +++ b/solr/core/src/test/org/apache/solr/cloud/TlogReplayBufferedWhileIndexingTest.java @@ -0,0 +1,136 @@ +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 + * 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. + */ + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +import org.apache.lucene.util.LuceneTestCase.Nightly; +import org.apache.solr.SolrTestCaseJ4.SuppressSSL; +import org.apache.lucene.util.LuceneTestCase.Slow; +import org.apache.solr.client.solrj.SolrServerException; +import org.apache.solr.client.solrj.embedded.JettySolrRunner; +import org.apache.solr.common.SolrInputDocument; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + +@Slow +@Nightly +@SuppressSSL +public class TlogReplayBufferedWhileIndexingTest extends AbstractFullDistribZkTestBase { + + private List threads; + + public TlogReplayBufferedWhileIndexingTest() throws Exception { + super(); + sliceCount = 1; + fixShardCount(2); + schemaString = "schema15.xml"; // we need a string id + } + + @BeforeClass + public static void beforeRestartWhileUpdatingTest() throws Exception { + System.setProperty("leaderVoteWait", "300000"); + System.setProperty("solr.autoCommit.maxTime", "10000"); + System.setProperty("solr.autoSoftCommit.maxTime", "3000"); + if (System.getProperty("solr.hdfs.home") != null) useFactory("solr.StandardDirectoryFactory"); + } + + @AfterClass + public static void afterRestartWhileUpdatingTest() { + System.clearProperty("leaderVoteWait"); + System.clearProperty("solr.autoCommit.maxTime"); + System.clearProperty("solr.autoSoftCommit.maxTime"); + } + + @Test + public void test() throws Exception { + handle.clear(); + handle.put("timestamp", SKIPVAL); + + waitForRecoveriesToFinish(false); + + int numThreads = 1; + + threads = new ArrayList<>(numThreads); + + ArrayList allJetty = new ArrayList<>(); + allJetty.addAll(jettys); + allJetty.remove(shardToLeaderJetty.get("shard1").jetty); + assert allJetty.size() == 1 : allJetty.size(); + ChaosMonkey.stop(allJetty.get(0)); + + StoppableIndexingThread indexThread; + for (int i = 0; i < numThreads; i++) { + indexThread = new StoppableIndexingThread(controlClient, cloudClient, Integer.toString(i), false, 50000, 1, false); + threads.add(indexThread); + indexThread.start(); + } + + Thread.sleep(2000); + + ChaosMonkey.start(allJetty.get(0)); + + Thread.sleep(45000); + + waitForThingsToLevelOut(320); + + Thread.sleep(2000); + + waitForRecoveriesToFinish(DEFAULT_COLLECTION, cloudClient.getZkStateReader(), false, true); + + for (StoppableIndexingThread thread : threads) { + thread.safeStop(); + thread.safeStop(); + } + + waitForThingsToLevelOut(30); + + checkShardConsistency(false, false); + } + + @Override + protected void indexDoc(SolrInputDocument doc) throws IOException, + SolrServerException { + cloudClient.add(doc); + } + + + @Override + public void distribTearDown() throws Exception { + // make sure threads have been stopped... + if (threads != null) { + for (StoppableIndexingThread thread : threads) { + thread.safeStop(); + } + } + + super.distribTearDown(); + } + + // skip the randoms - they can deadlock... + @Override + protected void indexr(Object... fields) throws Exception { + SolrInputDocument doc = new SolrInputDocument(); + addFields(doc, fields); + addFields(doc, "rnd_b", true); + indexDoc(doc); + } +} diff --git a/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsTlogReplayBufferedWhileIndexingTest.java b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsTlogReplayBufferedWhileIndexingTest.java new file mode 100644 index 00000000000..534bb903559 --- /dev/null +++ b/solr/core/src/test/org/apache/solr/cloud/hdfs/HdfsTlogReplayBufferedWhileIndexingTest.java @@ -0,0 +1,63 @@ +package org.apache.solr.cloud.hdfs; + +/* + * 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. + */ + +import java.io.IOException; + +import org.apache.hadoop.hdfs.MiniDFSCluster; +import org.apache.lucene.util.LuceneTestCase.Slow; +import org.apache.solr.cloud.TlogReplayBufferedWhileIndexingTest; +import org.apache.solr.util.BadHdfsThreadsFilter; +import org.junit.AfterClass; +import org.junit.BeforeClass; + +import com.carrotsearch.randomizedtesting.annotations.Nightly; +import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters; + +@Slow +@Nightly +@ThreadLeakFilters(defaultFilters = true, filters = { + BadHdfsThreadsFilter.class // hdfs currently leaks thread(s) +}) +public class HdfsTlogReplayBufferedWhileIndexingTest extends TlogReplayBufferedWhileIndexingTest { + + public HdfsTlogReplayBufferedWhileIndexingTest() throws Exception { + super(); + } + + private static MiniDFSCluster dfsCluster; + + @BeforeClass + public static void setupClass() throws Exception { + dfsCluster = HdfsTestUtil.setupClass(createTempDir().toFile().getAbsolutePath()); + System.setProperty("solr.hdfs.blockcache.blocksperbank", "2048"); + } + + @AfterClass + public static void teardownClass() throws Exception { + HdfsTestUtil.teardownClass(dfsCluster); + dfsCluster = null; + } + + + @Override + protected String getDataDir(String dataDir) throws IOException { + return HdfsTestUtil.getDataDir(dfsCluster, dataDir); + } + +} From f6400e9cbb1158178af0b6cb7901a784368ab589 Mon Sep 17 00:00:00 2001 From: Uwe Schindler Date: Fri, 5 Feb 2016 00:07:23 +0100 Subject: [PATCH 12/12] SOLR-8586: Fix forbidden APIS; cleanup of imports --- .../apache/solr/update/IndexFingerprint.java | 40 ++----------------- 1 file changed, 4 insertions(+), 36 deletions(-) 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 c73b57b7a07..1ece0929fd4 100644 --- a/solr/core/src/java/org/apache/solr/update/IndexFingerprint.java +++ b/solr/core/src/java/org/apache/solr/update/IndexFingerprint.java @@ -19,55 +19,23 @@ package org.apache.solr.update; import java.io.IOException; import java.lang.invoke.MethodHandles; -import java.net.ConnectException; -import java.net.SocketException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashSet; import java.util.LinkedHashMap; -import java.util.List; import java.util.Map; -import java.util.Set; -import org.apache.http.NoHttpResponseException; -import org.apache.http.client.HttpClient; -import org.apache.http.conn.ConnectTimeoutException; -import org.apache.lucene.index.LeafReader; import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.queries.function.FunctionValues; import org.apache.lucene.queries.function.ValueSource; import org.apache.lucene.util.Bits; -import org.apache.lucene.util.BytesRef; -import org.apache.solr.client.solrj.SolrServerException; -import org.apache.solr.cloud.ZkController; -import org.apache.solr.common.SolrException; -import org.apache.solr.common.SolrInputDocument; -import org.apache.solr.common.params.ModifiableSolrParams; import org.apache.solr.common.util.Hash; import org.apache.solr.common.util.NamedList; -import org.apache.solr.common.util.StrUtils; import org.apache.solr.core.SolrCore; -import org.apache.solr.handler.component.HttpShardHandlerFactory; -import org.apache.solr.handler.component.ShardHandler; -import org.apache.solr.handler.component.ShardHandlerFactory; -import org.apache.solr.handler.component.ShardRequest; -import org.apache.solr.handler.component.ShardResponse; -import org.apache.solr.logging.MDCLoggingContext; -import org.apache.solr.request.LocalSolrQueryRequest; -import org.apache.solr.request.SolrQueryRequest; -import org.apache.solr.response.SolrQueryResponse; import org.apache.solr.schema.SchemaField; import org.apache.solr.search.SolrIndexSearcher; -import org.apache.solr.update.processor.UpdateRequestProcessor; -import org.apache.solr.update.processor.UpdateRequestProcessorChain; +import org.apache.solr.util.RTimer; import org.apache.solr.util.RefCounted; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.solr.update.processor.DistributedUpdateProcessor.DistribPhase.FROMLEADER; -import static org.apache.solr.update.processor.DistributingUpdateProcessorFactory.DISTRIB_UPDATE_PARAM; - /** @lucene.internal */ public class IndexFingerprint { private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); @@ -122,7 +90,7 @@ public class IndexFingerprint { } public static IndexFingerprint getFingerprint(SolrIndexSearcher searcher, long maxVersion) throws IOException { - long start = System.currentTimeMillis(); + RTimer timer = new RTimer(); SchemaField versionField = VersionInfo.getAndCheckVersionField(searcher.getSchema()); @@ -151,8 +119,8 @@ public class IndexFingerprint { } } - long end = System.currentTimeMillis(); - log.info("IndexFingerprint millis:" + (end-start) + " result:" + f); + final double duration = timer.stop(); + log.info("IndexFingerprint millis:" + duration + " result:" + f); return f; }