Fix compile errors

Author: takaoka-k-wap

build.gradle

@@ -44,6 +44,7 @@ task distZip(dependsOn: ['jar', 'embedVersion', 'copyDependencies'], type: Zip)
     archiveBaseName = archivesBaseName
     appendix = elasticsearchVersion
     from 'build/libs/', 'build/descriptor', 'LICENSE', 'README.md'
+    into 'elasticsearch'
 }
 
 artifacts {

src/test/java/com/worksap/nlp/elasticsearch/sudachi/index/TestSudachiAnalysis.java

@@ -37,7 +37,6 @@
 import org.elasticsearch.cluster.metadata.IndexMetaData;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.env.Environment;
-import org.elasticsearch.env.TestEnvironment;
 import org.elasticsearch.index.Index;
 import org.elasticsearch.index.analysis.AnalysisRegistry;
 import org.elasticsearch.index.analysis.TokenizerFactory;
@@ -97,7 +96,7 @@ public void tokenizerWithAdditionalSettings() throws IOException {
     public void analyzerProvider() throws IOException {
         Settings indexSettings = Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT).build();
         Settings nodeSettings = Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), testFolder.getRoot().getPath()).build();
-        Environment env = TestEnvironment.newEnvironment(nodeSettings);
+        Environment env = new Environment(nodeSettings);
         Settings settings = Settings.builder().put("settings_path", "sudachi/sudachi.json").build();
         SudachiAnalyzerProvider provider = new SudachiAnalyzerProvider(IndexSettingsModule.newIndexSettings(new Index("test", "_na_"), indexSettings), env, "sudachi", settings);
         try (TokenStream stream = provider.get().tokenStream("_na_", "東京へ行く。")) {
@@ -111,7 +110,7 @@ Map<String, TokenizerFactory> createTestTokenizers(Map<String, String> settings)
         builder.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT);
         Settings indexSettings = builder.build();
         Settings nodeSettings = Settings.builder().put(Environment.PATH_HOME_SETTING.getKey(), testFolder.getRoot().getPath()).build();
-        Environment env = TestEnvironment.newEnvironment(nodeSettings);
+        Environment env = new Environment(nodeSettings);
         AnalysisModule analysisModule = new AnalysisModule(env, Collections.singletonList(new AnalysisSudachiPlugin()));
         AnalysisRegistry analysisRegistry = analysisModule.getAnalysisRegistry();
         return analysisRegistry.buildTokenizerFactories(IndexSettingsModule.newIndexSettings(new Index("test", "_na_"), indexSettings));

src/test/java/com/worksap/nlp/lucene/sudachi/ja/TestSudachiAnalyzer.java

@@ -153,10 +153,10 @@ public void testQuery() throws Exception {
             assertThat(values[0], is(INPUT_TEXT));
 
             query = queryParser.parse("京都");
-            assertThat(searcher.search(query, 5).totalHits, is(0L));
+            assertThat(searcher.search(query, 5).totalHits, is(0));
 
             query = queryParser.parse("岩波");
-            assertThat(searcher.search(query, 5).totalHits, is(0L));
+            assertThat(searcher.search(query, 5).totalHits, is(0));
         }
     }
 }