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 b6b4033fe8f..dca843de6cc 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 3234592602b..751e14ebe18 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 5a38b441206..4f3b25422cc 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 a001a0e6919..a4bc2eab36e 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 dc7a92c93f8..87fde830891 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/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 f6a62723169..ce8884cf47f 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 83ff90b564d..ba1b71c8684 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/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/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/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 4b32ec836fd..2a2bfd29569 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 cafe0a32825..68b7cc23ea5 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 bf5625a2ac4..16caae3baa5 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 acf1ebe7ec8..930daeea117 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 90d3c1c6f16..a8d38701eb3 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 4ffc1f87c29..e3fd6995273 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 org.apache.lucene.document.Document; import org.apache.lucene.document.IntPoint; 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 a4b81de215a..4c1badaf731 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 1d7d3052d1c..b9cdf2b9129 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 java.io.IOException; import java.util.Collection; 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 fe659e0a0d3..59bf1c58a3a 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; @@ -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/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java b/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java index dafdcddce6b..f65b079e033 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 2040c7266de..189ef203be7 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 705c68bdcb0..803b1d9bc65 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 2d33f71bff1..30ac6c60242 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 50daac3e0a3..3ea9da004b5 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.net.URI; 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 d0008c9326d..4f6ef89814f 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 4ac3f44f103..5ae0e693ba0 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 be98ef03c4f..6837d03cd30 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 e87610a4776..86e597eb794 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 6daa3ca6a8f..07c78dc9500 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 7570163c082..28041ae4cef 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 44d938fd049..e63894f1089 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 java.util.HashSet; import java.util.List; 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 e6fe6e82fd6..eecb3bd898c 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 c4f39a82972..f4c63234b64 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/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/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 1d53c5acc74..204b7d904b8 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 3d15971da6f..11f7f80f3b5 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 df1ed20f237..26f1cbb91e1 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 ac32babe06d..38c72511803 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 6e8874f85f9..741c1438443 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 360933a9b69..0ace80469f1 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 a0fda68b36c..082daa05f44 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 e6c8f57a9a4..ad87ed82012 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 13aeb0b1dff..b302e9885b2 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 931eea6bd9f..3cd9a6a6c0a 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 3956613811a..b08a85d6a7c 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 f1d04183f5f..a284fdd9d10 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 7e08683284a..3fca6819f30 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 3df8dc55da7..df81d8ff0aa 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 b07ab0bf485..99f9e0c2e8e 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 04de4b2c6da..bdd3dfa69da 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 7201bad154a..4e62daf78dc 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 dd4e1759b04..c5d30666353 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 d33d01c594f..84bdd9f52ec 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 2c284bdd406..dc9e3e75b25 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 522fbf9cfc4..5a46c143576 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 0a414ae3e11..67819bdd48f 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 2a239a4f0c6..bdec65cbb2d 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 6cf8bb8280b..c35293817d2 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/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/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/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/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 a860ec96efa..7a714508190 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 @@ -31,6 +31,20 @@ import org.apache.lucene.store.Directory; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.TestUtil; +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 { private void dotest(int ncats, final int range) throws Exception { 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 49fc9bd0135..801b46fcf8b 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,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 @@ -17,6 +15,8 @@ package org.apache.lucene.facet.taxonomy.writercache; * limitations under the License. */ +package org.apache.lucene.facet.taxonomy.writercache; + import java.nio.ByteBuffer; import java.nio.charset.CharsetDecoder; import java.nio.charset.CodingErrorAction; 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/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/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/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/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/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 DocValuesTermsCollectorA 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/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 760535fff29..2b14d6e8016 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/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/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 7f907afe489..b2e98809df8 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/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/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/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.EntryNOTE: 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 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
* 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/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/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/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 735163bf618..a6c1da90ec8 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.lang.invoke.MethodHandles;
import java.nio.file.Path;
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/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..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
@@ -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;
@@ -67,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;
@@ -597,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);
@@ -609,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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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 An update processor that parses configured fields of any document being added
* using {@link PreAnalyzedField} with the configured format parser.
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/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/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-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/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/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/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..d811f5c1d93 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;
@@ -174,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/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/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/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.
*
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/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/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/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/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/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