bump master (3.0-snapshot) to java 8

elastic · Sep 3, 2015 · 8634633 · 8634633
1 parent 3cd86a5
commit 8634633
Show file tree

Hide file tree

Showing 12 changed files with 49 additions and 85 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -191,13 +191,6 @@
             <optional>true</optional>
         </dependency>
 
-        <!-- remove this for java 8 -->
-        <dependency>
-            <groupId>com.twitter</groupId>
-            <artifactId>jsr166e</artifactId>
-            <version>1.1.0</version>
-        </dependency>
-
     </dependencies>
 
     <build>

diff --git a/core/src/main/java/org/elasticsearch/bootstrap/Security.java b/core/src/main/java/org/elasticsearch/bootstrap/Security.java
@@ -122,7 +122,6 @@ public void checkExit(int status) {
     static {
         Map<Pattern,String> m = new IdentityHashMap<>();
         m.put(Pattern.compile(".*lucene-core-.*\\.jar$"),    "es.security.jar.lucene.core");
-        m.put(Pattern.compile(".*jsr166e-.*\\.jar$"),        "es.security.jar.twitter.jsr166e");
         m.put(Pattern.compile(".*securemock-.*\\.jar$"),     "es.security.jar.elasticsearch.securemock");
         SPECIAL_JARS = Collections.unmodifiableMap(m);
     }

diff --git a/core/src/main/java/org/elasticsearch/common/lucene/Lucene.java b/core/src/main/java/org/elasticsearch/common/lucene/Lucene.java
@@ -107,7 +107,7 @@ public static Iterable<String> files(SegmentInfos infos) throws IOException {
         for (SegmentCommitInfo info : infos) {
             list.add(info.files());
         }
-        return Iterables.concat(list.toArray(new Collection[0]));
+        return Iterables.concat(list);
     }
 
     /**

diff --git a/core/src/main/java/org/elasticsearch/common/metrics/CounterMetric.java b/core/src/main/java/org/elasticsearch/common/metrics/CounterMetric.java
@@ -19,7 +19,7 @@
 
 package org.elasticsearch.common.metrics;
 
-import com.twitter.jsr166e.LongAdder;
+import java.util.concurrent.atomic.LongAdder;
 
 /**
  */

diff --git a/core/src/main/java/org/elasticsearch/common/metrics/EWMA.java b/core/src/main/java/org/elasticsearch/common/metrics/EWMA.java
@@ -19,7 +19,7 @@
 
 package org.elasticsearch.common.metrics;
 
-import com.twitter.jsr166e.LongAdder;
+import java.util.concurrent.atomic.LongAdder;
 
 import java.util.concurrent.TimeUnit;
 

diff --git a/core/src/main/java/org/elasticsearch/common/metrics/MeanMetric.java b/core/src/main/java/org/elasticsearch/common/metrics/MeanMetric.java
@@ -19,7 +19,7 @@
 
 package org.elasticsearch.common.metrics;
 
-import com.twitter.jsr166e.LongAdder;
+import java.util.concurrent.atomic.LongAdder;
 
 /**
  */

diff --git a/core/src/main/java/org/elasticsearch/common/metrics/MeterMetric.java b/core/src/main/java/org/elasticsearch/common/metrics/MeterMetric.java
@@ -19,9 +19,9 @@
 
 package org.elasticsearch.common.metrics;
 
-import com.twitter.jsr166e.LongAdder;
 import org.elasticsearch.common.util.concurrent.FutureUtils;
 
+import java.util.concurrent.atomic.LongAdder;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;

diff --git a/core/src/main/java/org/elasticsearch/search/internal/InternalSearchHit.java b/core/src/main/java/org/elasticsearch/search/internal/InternalSearchHit.java
@@ -470,7 +470,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
             builder.field(Fields._SCORE, score);
         }
         for (SearchHitField field : metaFields) {
-            builder.field(field.name(), field.value());
+            builder.field(field.name(), (Object) field.value());
         }
         if (source != null) {
             XContentHelper.writeRawField("_source", source, builder, params);

diff --git a/core/src/main/java/org/elasticsearch/search/suggest/Suggest.java b/core/src/main/java/org/elasticsearch/search/suggest/Suggest.java
@@ -112,6 +112,7 @@ public void readFrom(StreamInput in) throws IOException {
         final int size = in.readVInt();
         suggestions = new ArrayList<>(size);
         for (int i = 0; i < size; i++) {
+            // TODO: remove these complicated generics
             Suggestion<? extends Entry<? extends Option>> suggestion;
             final int type = in.readVInt();
             switch (type) {
@@ -125,7 +126,7 @@ public void readFrom(StreamInput in) throws IOException {
                 suggestion = new PhraseSuggestion();
                 break;
             default:
-                suggestion = new Suggestion<>();
+                suggestion = new Suggestion<Entry<? extends Option>>();
                 break;
             }
             suggestion.readFrom(in);

diff --git a/core/src/main/resources/org/elasticsearch/bootstrap/security.policy b/core/src/main/resources/org/elasticsearch/bootstrap/security.policy
@@ -36,12 +36,6 @@ grant codeBase "${es.security.jar.lucene.core}" {
   permission java.lang.RuntimePermission "accessClassInPackage.sun.misc";
 };
 
-grant codeBase "${es.security.jar.twitter.jsr166e}" {
-  // needed for LongAdder etc
-  // TODO: remove this in java 8!
-  permission java.lang.RuntimePermission "accessClassInPackage.sun.misc";
-};
-
 grant codeBase "${es.security.jar.elasticsearch.securemock}" {
   // needed to support creation of mocks
   permission java.lang.RuntimePermission "reflectionFactoryAccess";

diff --git a/core/src/test/java/org/elasticsearch/script/expression/ExpressionScriptIT.java b/core/src/test/java/org/elasticsearch/script/expression/ExpressionScriptIT.java
@@ -85,7 +85,7 @@ public void testBasic() throws Exception {
         client().prepareIndex("test", "doc", "1").setSource("foo", 4).setRefresh(true).get();
         SearchResponse rsp = buildRequest("doc['foo'] + 1").get();
         assertEquals(1, rsp.getHits().getTotalHits());
-        assertEquals(5.0, rsp.getHits().getAt(0).field("foo").getValue());
+        assertEquals(5.0, rsp.getHits().getAt(0).field("foo").getValue(), 0.0D);
     }
 
     public void testBasicUsingDotValue() throws Exception {
@@ -94,7 +94,7 @@ public void testBasicUsingDotValue() throws Exception {
         client().prepareIndex("test", "doc", "1").setSource("foo", 4).setRefresh(true).get();
         SearchResponse rsp = buildRequest("doc['foo'].value + 1").get();
         assertEquals(1, rsp.getHits().getTotalHits());
-        assertEquals(5.0, rsp.getHits().getAt(0).field("foo").getValue());
+        assertEquals(5.0, rsp.getHits().getAt(0).field("foo").getValue(), 0.0D);
     }
 
     public void testScore() throws Exception {
@@ -126,23 +126,23 @@ public void testDateMethods() throws Exception {
         SearchResponse rsp = buildRequest("doc['date0'].getSeconds() - doc['date0'].getMinutes()").get();
         assertEquals(2, rsp.getHits().getTotalHits());
         SearchHits hits = rsp.getHits();
-        assertEquals(5.0, hits.getAt(0).field("foo").getValue());
-        assertEquals(-11.0, hits.getAt(1).field("foo").getValue());
+        assertEquals(5.0, hits.getAt(0).field("foo").getValue(), 0.0D);
+        assertEquals(-11.0, hits.getAt(1).field("foo").getValue(), 0.0D);
         rsp = buildRequest("doc['date0'].getHourOfDay() + doc['date1'].getDayOfMonth()").get();
         assertEquals(2, rsp.getHits().getTotalHits());
         hits = rsp.getHits();
-        assertEquals(5.0, hits.getAt(0).field("foo").getValue());
-        assertEquals(24.0, hits.getAt(1).field("foo").getValue());
+        assertEquals(5.0, hits.getAt(0).field("foo").getValue(), 0.0D);
+        assertEquals(24.0, hits.getAt(1).field("foo").getValue(), 0.0D);
         rsp = buildRequest("doc['date1'].getMonth() + 1").get();
         assertEquals(2, rsp.getHits().getTotalHits());
         hits = rsp.getHits();
-        assertEquals(9.0, hits.getAt(0).field("foo").getValue());
-        assertEquals(10.0, hits.getAt(1).field("foo").getValue());
+        assertEquals(9.0, hits.getAt(0).field("foo").getValue(), 0.0D);
+        assertEquals(10.0, hits.getAt(1).field("foo").getValue(), 0.0D);
         rsp = buildRequest("doc['date1'].getYear()").get();
         assertEquals(2, rsp.getHits().getTotalHits());
         hits = rsp.getHits();
-        assertEquals(1985.0, hits.getAt(0).field("foo").getValue());
-        assertEquals(1983.0, hits.getAt(1).field("foo").getValue());
+        assertEquals(1985.0, hits.getAt(0).field("foo").getValue(), 0.0D);
+        assertEquals(1983.0, hits.getAt(1).field("foo").getValue(), 0.0D);
     }
 
     public void testMultiValueMethods() throws Exception {
@@ -158,57 +158,57 @@ public void testMultiValueMethods() throws Exception {
         assertSearchResponse(rsp);
         SearchHits hits = rsp.getHits();
         assertEquals(3, hits.getTotalHits());
-        assertEquals(5.0, hits.getAt(0).field("foo").getValue());
-        assertEquals(2.0, hits.getAt(1).field("foo").getValue());
-        assertEquals(5.0, hits.getAt(2).field("foo").getValue());
+        assertEquals(5.0, hits.getAt(0).field("foo").getValue(), 0.0D);
+        assertEquals(2.0, hits.getAt(1).field("foo").getValue(), 0.0D);
+        assertEquals(5.0, hits.getAt(2).field("foo").getValue(), 0.0D);
 
         rsp = buildRequest("doc['double0'].sum()").get();
         assertSearchResponse(rsp);
         hits = rsp.getHits();
         assertEquals(3, hits.getTotalHits());
-        assertEquals(7.5, hits.getAt(0).field("foo").getValue());
-        assertEquals(5.0, hits.getAt(1).field("foo").getValue());
-        assertEquals(6.0, hits.getAt(2).field("foo").getValue());
+        assertEquals(7.5, hits.getAt(0).field("foo").getValue(), 0.0D);
+        assertEquals(5.0, hits.getAt(1).field("foo").getValue(), 0.0D);
+        assertEquals(6.0, hits.getAt(2).field("foo").getValue(), 0.0D);
 
         rsp = buildRequest("doc['double0'].avg() + doc['double1'].avg()").get();
         assertSearchResponse(rsp);
         hits = rsp.getHits();
         assertEquals(3, hits.getTotalHits());
-        assertEquals(4.3, hits.getAt(0).field("foo").getValue());
-        assertEquals(8.0, hits.getAt(1).field("foo").getValue());
-        assertEquals(5.5, hits.getAt(2).field("foo").getValue());
+        assertEquals(4.3, hits.getAt(0).field("foo").getValue(), 0.0D);
+        assertEquals(8.0, hits.getAt(1).field("foo").getValue(), 0.0D);
+        assertEquals(5.5, hits.getAt(2).field("foo").getValue(), 0.0D);
 
         rsp = buildRequest("doc['double0'].median()").get();
         assertSearchResponse(rsp);
         hits = rsp.getHits();
         assertEquals(3, hits.getTotalHits());
-        assertEquals(1.5, hits.getAt(0).field("foo").getValue());
-        assertEquals(5.0, hits.getAt(1).field("foo").getValue());
-        assertEquals(1.25, hits.getAt(2).field("foo").getValue());
+        assertEquals(1.5, hits.getAt(0).field("foo").getValue(), 0.0D);
+        assertEquals(5.0, hits.getAt(1).field("foo").getValue(), 0.0D);
+        assertEquals(1.25, hits.getAt(2).field("foo").getValue(), 0.0D);
 
         rsp = buildRequest("doc['double0'].min()").get();
         assertSearchResponse(rsp);
         hits = rsp.getHits();
         assertEquals(3, hits.getTotalHits());
-        assertEquals(1.0, hits.getAt(0).field("foo").getValue());
-        assertEquals(5.0, hits.getAt(1).field("foo").getValue());
-        assertEquals(-1.5, hits.getAt(2).field("foo").getValue());
+        assertEquals(1.0, hits.getAt(0).field("foo").getValue(), 0.0D);
+        assertEquals(5.0, hits.getAt(1).field("foo").getValue(), 0.0D);
+        assertEquals(-1.5, hits.getAt(2).field("foo").getValue(), 0.0D);
 
         rsp = buildRequest("doc['double0'].max()").get();
         assertSearchResponse(rsp);
         hits = rsp.getHits();
         assertEquals(3, hits.getTotalHits());
-        assertEquals(5.0, hits.getAt(0).field("foo").getValue());
-        assertEquals(5.0, hits.getAt(1).field("foo").getValue());
-        assertEquals(5.0, hits.getAt(2).field("foo").getValue());
+        assertEquals(5.0, hits.getAt(0).field("foo").getValue(), 0.0D);
+        assertEquals(5.0, hits.getAt(1).field("foo").getValue(), 0.0D);
+        assertEquals(5.0, hits.getAt(2).field("foo").getValue(), 0.0D);
 
         rsp = buildRequest("doc['double0'].sum()/doc['double0'].count()").get();
         assertSearchResponse(rsp);
         hits = rsp.getHits();
         assertEquals(3, hits.getTotalHits());
-        assertEquals(2.5, hits.getAt(0).field("foo").getValue());
-        assertEquals(5.0, hits.getAt(1).field("foo").getValue());
-        assertEquals(1.5, hits.getAt(2).field("foo").getValue());
+        assertEquals(2.5, hits.getAt(0).field("foo").getValue(), 0.0D);
+        assertEquals(5.0, hits.getAt(1).field("foo").getValue(), 0.0D);
+        assertEquals(1.5, hits.getAt(2).field("foo").getValue(), 0.0D);
     }
 
     public void testInvalidDateMethodCall() throws Exception {
@@ -236,8 +236,8 @@ public void testSparseField() throws Exception {
         ElasticsearchAssertions.assertSearchResponse(rsp);
         SearchHits hits = rsp.getHits();
         assertEquals(2, rsp.getHits().getTotalHits());
-        assertEquals(5.0, hits.getAt(0).field("foo").getValue());
-        assertEquals(1.0, hits.getAt(1).field("foo").getValue());
+        assertEquals(5.0, hits.getAt(0).field("foo").getValue(), 0.0D);
+        assertEquals(1.0, hits.getAt(1).field("foo").getValue(), 0.0D);
     }
 
     public void testMissingField() throws Exception {
@@ -267,9 +267,9 @@ public void testParams() throws Exception {
         SearchResponse rsp = buildRequest(script, "a", 2, "b", 3.5, "c", 5000000000L).get();
         SearchHits hits = rsp.getHits();
         assertEquals(3, hits.getTotalHits());
-        assertEquals(24.5, hits.getAt(0).field("foo").getValue());
-        assertEquals(9.5, hits.getAt(1).field("foo").getValue());
-        assertEquals(13.5, hits.getAt(2).field("foo").getValue());
+        assertEquals(24.5, hits.getAt(0).field("foo").getValue(), 0.0D);
+        assertEquals(9.5, hits.getAt(1).field("foo").getValue(), 0.0D);
+        assertEquals(13.5, hits.getAt(2).field("foo").getValue(), 0.0D);
     }
 
     public void testCompileFailure() {

diff --git a/pom.xml b/pom.xml
@@ -37,8 +37,8 @@
         <!-- elasticsearch stack -->
         <elasticsearch.version>${project.version}</elasticsearch.version>
         <jvm.executable>${java.home}${file.separator}bin${file.separator}java</jvm.executable>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
 
         <!-- libraries -->
         <lucene.version>5.3.0</lucene.version>
@@ -171,12 +171,6 @@
                 <version>1.0</version>
             </dependency>
 
-            <dependency>
-                <groupId>com.twitter</groupId>
-                <artifactId>jsr166e</artifactId>
-                <version>1.1.0</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.apache.lucene</groupId>
                 <artifactId>lucene-test-framework</artifactId>
@@ -605,7 +599,6 @@
                         <jvmArgs>
                             <param>-Xmx${tests.heap.size}</param>
                             <param>-Xms${tests.heap.size}</param>
-                            <param>${java.permGenSpace}</param>
                             <param>-XX:MaxDirectMemorySize=512m</param>
                             <param>-Des.logger.prefix=</param>
                             <param>-XX:+HeapDumpOnOutOfMemoryError</param>
@@ -1016,16 +1009,16 @@ org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=enabled
 org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
 org.eclipse.jdt.core.compiler.annotation.nullable=org.elasticsearch.common.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
 org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
 org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=warning
 org.eclipse.jdt.core.compiler.problem.nullReference=warning
 org.eclipse.jdt.core.compiler.problem.nullSpecViolation=warning
 org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.lineSplit=140
 org.eclipse.jdt.core.formatter.tabulation.char=space
 org.eclipse.jdt.core.formatter.tabulation.size=4
@@ -1108,22 +1101,6 @@ org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UT
                     <artifactId>maven-antrun-plugin</artifactId>
                     <version>1.8</version>
                     <executions>
-                        <execution>
-                            <id>set-permgen</id>
-                            <phase>validate</phase>
-                            <goals>
-                                <goal>run</goal>
-                            </goals>
-                            <configuration>
-                                <target>
-                                    <!-- if we are on java 1.7.* we set perm gen space since some tests need it otherwise we just inject a dummy value -->
-                                    <condition property="java.permGenSpace" value="-XX:MaxPermSize=128m" else="-Dsome.dummy.value=" >
-                                        <matches pattern="1\.7\..+$" string="${java.runtime.version}" />
-                                    </condition>
-                                </target>
-                                <exportAntProperties>true</exportAntProperties>
-                            </configuration>
-                        </execution>
                         <execution>
                             <id>check-invalid-patterns</id>
                             <phase>validate</phase>