Add missing license headers, move package names after license headers

src/main/java/org/apache/lucene/index/memory/ExtendedMemoryIndex.java

@@ -1,5 +1,3 @@
-package org.apache.lucene.index.memory;
-
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -19,6 +17,8 @@ package org.apache.lucene.index.memory;
  * under the License.
  */
 
+package org.apache.lucene.index.memory;
+
 /**
  * This class overwrites {@link MemoryIndex} to make the reuse constructor visible.
  */

src/main/java/org/apache/lucene/queries/ExtendedCommonTermsQuery.java

@@ -1,4 +1,3 @@
-package org.apache.lucene.queries;
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -17,6 +16,9 @@ package org.apache.lucene.queries;
  * specific language governing permissions and limitations
  * under the License.
  */
+
+package org.apache.lucene.queries;
+
 import org.apache.lucene.search.BooleanClause.Occur;
 import org.elasticsearch.common.lucene.search.Queries;
 

src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsIndices.java

@@ -1,4 +1,3 @@
-package org.elasticsearch.action.admin.cluster.stats;
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -18,6 +17,7 @@ package org.elasticsearch.action.admin.cluster.stats;
  * under the License.
  */
 
+package org.elasticsearch.action.admin.cluster.stats;
 
 import com.carrotsearch.hppc.ObjectObjectOpenHashMap;
 import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
@@ -249,17 +249,23 @@ public class ClusterStatsIndices implements ToXContent, Streamable {
             return (((double) (total - primaries)) / primaries);
         }
 
-        /** the maximum number of shards (primary+replicas) an index has */
+        /**
+         * the maximum number of shards (primary+replicas) an index has
+         */
         public int getMaxIndexShards() {
             return this.maxIndexShards;
         }
 
-        /** the minimum number of shards (primary+replicas) an index has */
+        /**
+         * the minimum number of shards (primary+replicas) an index has
+         */
         public int getMinIndexShards() {
             return this.minIndexShards;
         }
 
-        /** average number of shards (primary+replicas) across the indices */
+        /**
+         * average number of shards (primary+replicas) across the indices
+         */
         public double getAvgIndexShards() {
             if (this.indices == 0) {
                 return -1;
@@ -274,12 +280,16 @@ public class ClusterStatsIndices implements ToXContent, Streamable {
             return this.maxIndexPrimaryShards;
         }
 
-        /** the minimum number of primary shards an index has */
+        /**
+         * the minimum number of primary shards an index has
+         */
         public int getMinIndexPrimaryShards() {
             return this.minIndexPrimaryShards;
         }
 
-        /** the average number primary shards across the indices */
+        /**
+         * the average number primary shards across the indices
+         */
         public double getAvgIndexPrimaryShards() {
             if (this.indices == 0) {
                 return -1;

src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsNodes.java

@@ -1,4 +1,3 @@
-package org.elasticsearch.action.admin.cluster.stats;
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -18,6 +17,7 @@ package org.elasticsearch.action.admin.cluster.stats;
  * under the License.
  */
 
+package org.elasticsearch.action.admin.cluster.stats;
 
 import com.carrotsearch.hppc.ObjectIntOpenHashMap;
 import com.carrotsearch.hppc.cursors.ObjectIntCursor;

src/main/java/org/elasticsearch/action/termvector/MultiTermVectorsRequest.java

@@ -1,5 +1,3 @@
-package org.elasticsearch.action.termvector;
-
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -19,6 +17,8 @@ package org.elasticsearch.action.termvector;
  * under the License.
  */
 
+package org.elasticsearch.action.termvector;
+
 import org.elasticsearch.ElasticsearchIllegalArgumentException;
 import org.elasticsearch.ElasticsearchParseException;
 import org.elasticsearch.action.ActionRequest;

src/main/java/org/elasticsearch/action/termvector/MultiTermVectorsRequestBuilder.java

@@ -1,4 +1,3 @@
-package org.elasticsearch.action.termvector;
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -18,6 +17,7 @@ package org.elasticsearch.action.termvector;
  * under the License.
  */
 
+package org.elasticsearch.action.termvector;
 
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.ActionRequestBuilder;

src/main/java/org/elasticsearch/action/update/UpdateHelper.java

@@ -1,3 +1,22 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.elasticsearch.action.update;
 
 import org.elasticsearch.ElasticsearchIllegalArgumentException;

src/main/java/org/elasticsearch/common/collect/HppcMaps.java

@@ -1,3 +1,22 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.elasticsearch.common.collect;
 
 import com.carrotsearch.hppc.ObjectIntOpenHashMap;

src/main/java/org/elasticsearch/common/joda/DateMathParser.java

@@ -1,3 +1,22 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.elasticsearch.common.joda;
 
 import org.elasticsearch.ElasticsearchParseException;

src/main/java/org/elasticsearch/index/analysis/CJKBigramFilterFactory.java

@@ -1,4 +1,3 @@
-package org.elasticsearch.index.analysis;
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -17,9 +16,8 @@ package org.elasticsearch.index.analysis;
  * specific language governing permissions and limitations
  * under the License.
  */
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
+
+package org.elasticsearch.index.analysis;
 
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.cjk.CJKBigramFilter;
@@ -29,18 +27,22 @@ import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.index.Index;
 import org.elasticsearch.index.settings.IndexSettings;
 
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
 /**
  * Factory that creates a {@link CJKBigramFilter} to form bigrams of CJK terms
  * that are generated from StandardTokenizer or ICUTokenizer.
- * <p>
+ * <p/>
  * CJK types are set by these tokenizers, but you can also use flags to
  * explicitly control which of the CJK scripts are turned into bigrams.
- * <p>
+ * <p/>
  * By default, when a CJK character has no adjacent characters to form a bigram,
  * it is output in unigram form. If you want to always output both unigrams and
  * bigrams, set the <code>outputUnigrams</code> flag. This can be used for a
  * combined unigram+bigram approach.
- * <p>
+ * <p/>
  * In all cases, all non-CJK input is passed thru unmodified.
  */
 public final class CJKBigramFilterFactory extends AbstractTokenFilterFactory {

src/main/java/org/elasticsearch/index/analysis/CJKWidthFilterFactory.java

@@ -1,4 +1,3 @@
-package org.elasticsearch.index.analysis;
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -17,6 +16,9 @@ package org.elasticsearch.index.analysis;
  * specific language governing permissions and limitations
  * under the License.
  */
+
+package org.elasticsearch.index.analysis;
+
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.cjk.CJKWidthFilter;
 import org.elasticsearch.common.inject.Inject;

src/main/java/org/elasticsearch/index/analysis/KeepWordFilterFactory.java

@@ -1,4 +1,3 @@
-package org.elasticsearch.index.analysis;
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -18,6 +17,8 @@ package org.elasticsearch.index.analysis;
  * under the License.
  */
 
+package org.elasticsearch.index.analysis;
+
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.miscellaneous.KeepWordFilter;
 import org.apache.lucene.analysis.util.CharArraySet;

src/main/java/org/elasticsearch/index/fielddata/AbstractIndexFieldData.java

@@ -1,3 +1,22 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.elasticsearch.index.fielddata;
 
 import org.apache.lucene.index.AtomicReaderContext;

src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/DoubleValuesComparatorBase.java

@@ -1,4 +1,3 @@
-package org.elasticsearch.index.fielddata.fieldcomparator;
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -18,6 +17,8 @@ package org.elasticsearch.index.fielddata.fieldcomparator;
  * under the License.
  */
 
+package org.elasticsearch.index.fielddata.fieldcomparator;
+
 import org.apache.lucene.index.AtomicReaderContext;
 import org.apache.lucene.search.FieldComparator;
 import org.elasticsearch.index.fielddata.DoubleValues;

src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/LongValuesComparatorBase.java

@@ -1,4 +1,3 @@
-package org.elasticsearch.index.fielddata.fieldcomparator;
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -18,6 +17,8 @@ package org.elasticsearch.index.fielddata.fieldcomparator;
  * under the License.
  */
 
+package org.elasticsearch.index.fielddata.fieldcomparator;
+
 import org.apache.lucene.index.AtomicReaderContext;
 import org.apache.lucene.search.FieldComparator;
 import org.elasticsearch.index.fielddata.IndexNumericFieldData;

src/main/java/org/elasticsearch/index/percolator/PercolatorQueriesRegistry.java

@@ -1,3 +1,22 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.elasticsearch.index.percolator;
 
 import org.apache.lucene.index.Term;

src/main/java/org/elasticsearch/index/query/SimpleQueryStringFlag.java

@@ -1,3 +1,21 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.elasticsearch.index.query;
 
 import org.apache.lucene.queryparser.XSimpleQueryParser;

src/main/java/org/elasticsearch/percolator/PercolateException.java

@@ -1,3 +1,22 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.elasticsearch.percolator;
 
 import org.elasticsearch.ElasticsearchException;

src/main/java/org/elasticsearch/search/rescore/QueryRescorer.java

@@ -1,4 +1,3 @@
-package org.elasticsearch.search.rescore;
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -17,6 +16,9 @@ package org.elasticsearch.search.rescore;
  * specific language governing permissions and limitations
  * under the License.
  */
+
+package org.elasticsearch.search.rescore;
+
 import org.apache.lucene.index.AtomicReaderContext;
 import org.apache.lucene.index.Term;
 import org.apache.lucene.search.*;
@@ -41,6 +43,7 @@ public final class QueryRescorer implements Rescorer {
             public float combine(float primary, float secondary) {
                 return (primary + secondary) / 2;
             }
+
             @Override
             public String toString() {
                 return "avg";
@@ -51,6 +54,7 @@ public final class QueryRescorer implements Rescorer {
             public float combine(float primary, float secondary) {
                 return Math.max(primary, secondary);
             }
+
             @Override
             public String toString() {
                 return "max";
@@ -61,6 +65,7 @@ public final class QueryRescorer implements Rescorer {
             public float combine(float primary, float secondary) {
                 return Math.min(primary, secondary);
             }
+
             @Override
             public String toString() {
                 return "min";
@@ -71,6 +76,7 @@ public final class QueryRescorer implements Rescorer {
             public float combine(float primary, float secondary) {
                 return primary + secondary;
             }
+
             @Override
             public String toString() {
                 return "sum";
@@ -81,6 +87,7 @@ public final class QueryRescorer implements Rescorer {
             public float combine(float primary, float secondary) {
                 return primary * secondary;
             }
+
             @Override
             public String toString() {
                 return "product";
@@ -264,6 +271,7 @@ public final class QueryRescorer implements Rescorer {
     private static final class DocIdSorter extends IntroSorter {
         private ScoreDoc[] array;
         private ScoreDoc pivot;
+
         @Override
         protected void swap(int i, int j) {
             ScoreDoc scoreDoc = array[i];
@@ -301,6 +309,7 @@ public final class QueryRescorer implements Rescorer {
     private static final class ScoreSorter extends IntroSorter {
         private ScoreDoc[] array;
         private ScoreDoc pivot;
+
         @Override
         protected void swap(int i, int j) {
             ScoreDoc scoreDoc = array[i];
@@ -331,6 +340,7 @@ public final class QueryRescorer implements Rescorer {
     private static final class TopDocsFilter extends Filter {
 
         private final int[] docIds;
+
         public TopDocsFilter(TopDocs topDocs) {
             this.docIds = new int[topDocs.scoreDocs.length];
             ScoreDoc[] scoreDocs = topDocs.scoreDocs;
@@ -340,6 +350,7 @@ public final class QueryRescorer implements Rescorer {
             Arrays.sort(docIds);
 
         }
+
         @Override
         public DocIdSet getDocIdSet(AtomicReaderContext context, Bits acceptDocs) throws IOException {
             final int docBase = context.docBase;
@@ -382,7 +393,8 @@ public final class QueryRescorer implements Rescorer {
                                 current = stop;
                                 return docId = NO_MORE_DOCS;
                             }
-                            while(nextDoc() < target) {}
+                            while (nextDoc() < target) {
+                            }
                             return docId;
                         }
 

src/main/java/org/elasticsearch/search/rescore/Rescorer.java

@@ -1,4 +1,3 @@
-package org.elasticsearch.search.rescore;
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -17,8 +16,8 @@ package org.elasticsearch.search.rescore;
  * specific language governing permissions and limitations
  * under the License.
  */
-import java.io.IOException;
-import java.util.Set;
+
+package org.elasticsearch.search.rescore;
 
 import org.apache.lucene.index.Term;
 import org.apache.lucene.search.Explanation;
@@ -27,6 +26,9 @@ import org.elasticsearch.action.search.SearchType;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.search.internal.SearchContext;
 
+import java.io.IOException;
+import java.util.Set;
+
 /**
  * A query rescorer interface used to re-rank the Top-K results of a previously
  * executed search.
@@ -51,6 +53,7 @@ public interface Rescorer {
 
     /**
      * Executes an {@link Explanation} phase on the rescorer.
+     *
      * @param topLevelDocId  the global / top-level document ID to explain
      * @param context        the current {@link SearchContext}
      * @param rescoreContext TODO
@@ -61,6 +64,7 @@ public interface Rescorer {
 
     /**
      * Parses the {@link RescoreSearchContext} for this impelementation
+     *
      * @param parser  the parser to read the context from
      * @param context the current search context
      * @return the parsed {@link RescoreSearchContext}

src/main/java/org/elasticsearch/search/scan/ScanContext.java

@@ -1,4 +1,3 @@
-package org.elasticsearch.search.scan;
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -17,6 +16,9 @@ package org.elasticsearch.search.scan;
  * specific language governing permissions and limitations
  * under the License.
  */
+
+package org.elasticsearch.search.scan;
+
 import com.google.common.collect.Maps;
 import org.apache.lucene.index.AtomicReaderContext;
 import org.apache.lucene.index.IndexReader;

src/main/java/org/elasticsearch/search/suggest/completion/PayloadProcessor.java

@@ -1,4 +1,3 @@
-package org.elasticsearch.search.suggest.completion;
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -17,6 +16,9 @@ package org.elasticsearch.search.suggest.completion;
  * specific language governing permissions and limitations
  * under the License.
  */
+
+package org.elasticsearch.search.suggest.completion;
+
 import org.apache.lucene.util.BytesRef;
 
 import java.io.IOException;

src/main/java/org/elasticsearch/snapshots/SnapshotShardFailure.java

@@ -1,3 +1,22 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.elasticsearch.snapshots;
 
 import org.elasticsearch.ElasticsearchParseException;

src/main/java/org/elasticsearch/snapshots/SnapshotState.java

@@ -1,3 +1,22 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT 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.elasticsearch.snapshots;
 
 import org.elasticsearch.ElasticsearchIllegalArgumentException;

src/main/java/org/joda/time/base/BaseDateTime.java

@@ -13,6 +13,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+
 package org.joda.time.base;
 
 import org.joda.time.Chronology;

src/test/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsTests.java

@@ -1,4 +1,3 @@
-package org.elasticsearch.action.admin.cluster.stats;
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -18,6 +17,7 @@ package org.elasticsearch.action.admin.cluster.stats;
  * under the License.
  */
 
+package org.elasticsearch.action.admin.cluster.stats;
 
 import org.elasticsearch.Version;
 import org.elasticsearch.action.admin.cluster.health.ClusterHealthStatus;

src/test/java/org/elasticsearch/action/termvector/AbstractTermVectorTests.java

@@ -1,5 +1,3 @@
-package org.elasticsearch.action.termvector;
-
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -19,6 +17,8 @@ package org.elasticsearch.action.termvector;
  * under the License.
  */
 
+package org.elasticsearch.action.termvector;
+
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.TokenFilter;
 import org.apache.lucene.analysis.Tokenizer;
@@ -37,8 +37,6 @@ import org.apache.lucene.search.TopDocs;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.RAMDirectory;
 import org.elasticsearch.Version;
-import org.elasticsearch.action.termvector.TermVectorRequestBuilder;
-import org.elasticsearch.action.termvector.TermVectorResponse;
 import org.elasticsearch.common.inject.internal.Join;
 import org.elasticsearch.common.settings.ImmutableSettings;
 import org.elasticsearch.common.xcontent.XContentBuilder;

src/test/java/org/elasticsearch/action/termvector/MultiTermVectorsTests.java

@@ -1,4 +1,3 @@
-package org.elasticsearch.action.termvector;
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -18,16 +17,14 @@ package org.elasticsearch.action.termvector;
  * under the License.
  */
 
+package org.elasticsearch.action.termvector;
 
 import org.apache.lucene.index.DirectoryReader;
 import org.apache.lucene.index.Fields;
-import org.elasticsearch.action.termvector.MultiTermVectorsItemResponse;
-import org.elasticsearch.action.termvector.MultiTermVectorsRequestBuilder;
-import org.elasticsearch.action.termvector.MultiTermVectorsResponse;
-import org.elasticsearch.action.termvector.TermVectorRequestBuilder;
 import org.junit.Test;
 
 import static org.hamcrest.Matchers.equalTo;
+
 public class MultiTermVectorsTests extends AbstractTermVectorTests {
 
     @Test
@@ -64,6 +61,7 @@ public class MultiTermVectorsTests extends AbstractTermVectorTests {
         }
 
     }
+
     public void testMissingIndexThrowsMissingIndex() throws Exception {
         TermVectorRequestBuilder requestBuilder = client().prepareTermVector("testX", "typeX", Integer.toString(1));
         MultiTermVectorsRequestBuilder mtvBuilder = new MultiTermVectorsRequestBuilder(client());

src/test/java/org/elasticsearch/client/transport/TransportClientTests.java

@@ -1,4 +1,3 @@
-package org.elasticsearch.client.transport;
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -18,6 +17,7 @@ package org.elasticsearch.client.transport;
  * under the License.
  */
 
+package org.elasticsearch.client.transport;
 
 import org.elasticsearch.common.settings.ImmutableSettings;
 import org.elasticsearch.test.ElasticsearchIntegrationTest;

src/test/java/org/elasticsearch/cluster/ClusterHealthResponsesTests.java

@@ -1,4 +1,3 @@
-package org.elasticsearch.cluster;
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -18,6 +17,7 @@ package org.elasticsearch.cluster;
  * under the License.
  */
 
+package org.elasticsearch.cluster;
 
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;

src/test/java/org/elasticsearch/cluster/allocation/ShardsAllocatorModuleTests.java

@@ -1,5 +1,3 @@
-package org.elasticsearch.cluster.allocation;
-
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -19,6 +17,8 @@ package org.elasticsearch.cluster.allocation;
  * under the License.
  */
 
+package org.elasticsearch.cluster.allocation;
+
 import org.elasticsearch.cluster.routing.allocation.allocator.BalancedShardsAllocator;
 import org.elasticsearch.cluster.routing.allocation.allocator.EvenShardsCountAllocator;
 import org.elasticsearch.cluster.routing.allocation.allocator.ShardsAllocator;

src/test/java/org/elasticsearch/common/BooleansTests.java

@@ -1,4 +1,3 @@
-package org.elasticsearch.common;
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -18,6 +17,7 @@ package org.elasticsearch.common;
  * under the License.
  */
 
+package org.elasticsearch.common;
 
 import org.elasticsearch.test.ElasticsearchTestCase;
 import org.hamcrest.Matchers;

src/test/java/org/elasticsearch/common/xcontent/support/XContentHelperTests.java

@@ -1,4 +1,3 @@
-package org.elasticsearch.common.xcontent.support;
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -18,6 +17,7 @@ package org.elasticsearch.common.xcontent.support;
  * under the License.
  */
 
+package org.elasticsearch.common.xcontent.support;
 
 import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.test.ElasticsearchTestCase;
@@ -29,8 +29,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-
 public class XContentHelperTests extends ElasticsearchTestCase {
 
     Map<String, Object> getMap(Object... keyValues) {

src/test/java/org/elasticsearch/index/VersionTypeTests.java

@@ -1,4 +1,3 @@
-package org.elasticsearch.index;
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -18,6 +17,7 @@ package org.elasticsearch.index;
  * under the License.
  */
 
+package org.elasticsearch.index;
 
 import org.elasticsearch.common.lucene.uid.Versions;
 import org.elasticsearch.test.ElasticsearchTestCase;

src/test/java/org/elasticsearch/search/source/SourceFetchingTests.java

@@ -1,4 +1,3 @@
-package org.elasticsearch.search.source;
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -18,6 +17,7 @@ package org.elasticsearch.search.source;
  * under the License.
  */
 
+package org.elasticsearch.search.source;
 
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.test.ElasticsearchIntegrationTest;

src/test/java/org/elasticsearch/search/suggest/phrase/NoisyChannelSpellCheckerTests.java

@@ -1,4 +1,3 @@
-package org.elasticsearch.search.suggest.phrase;
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -17,6 +16,8 @@ package org.elasticsearch.search.suggest.phrase;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.elasticsearch.search.suggest.phrase;
+
 import com.google.common.base.Charsets;
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.TokenFilter;
@@ -51,6 +52,7 @@ import java.util.Map;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.greaterThan;
+
 public class NoisyChannelSpellCheckerTests extends ElasticsearchTestCase{
     private final BytesRef space = new BytesRef(" ");
     private final BytesRef preTag = new BytesRef("<em>");