Add Java 11 compatibility

.travis.yml

@@ -1,8 +1,8 @@
 language: java
 
 jdk:
-  - openjdk8
-    
+  - openjdk11
+
 # Replace Travis's default Maven installation step with a no-op.
 # This avoids redundantly pre-running 'mvn install -DskipTests' every time.
 install: true

docs/Changelog.md

@@ -5,6 +5,7 @@
 - Add Way Property Set for the UK (#2818)
 - Fixes surefire test failure during build (#2816)
 - Improve documentation for `mode` routing parameter (#2809)
+- Make OTP run on Java 11 (#2812)
 
 ## 1.4 (2019-07-30)
 

pom.xml

@@ -78,7 +78,7 @@
     </scm>
 
     <properties>
-        <geotools.version>20.1</geotools.version>
+        <geotools.version>21.2</geotools.version>
         <geotools.wfs.version>16.5</geotools.wfs.version>
         <jackson.version>2.9.7</jackson.version>
         <jersey.version>2.18</jersey.version>
@@ -172,11 +172,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
+                <version>3.8.1</version>
                 <configuration>
                     <!-- Target Java versions -->
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <release>11</release>
                 </configuration>
             </plugin>
             <plugin>
@@ -208,15 +207,35 @@
                     <docsDir>${project.build.directory}/site/enunciate</docsDir>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.1.2</version>
+                <configuration>
+                    <archive>
+                        <manifestEntries>
+                            <!-- For Java 11 Modules, specify a module name. Do not create module-info.java until all
+                                 our dependencies specify a module name. -->
+                            <Automatic-Module-Name>org.opentripplanner.otp</Automatic-Module-Name>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+
+            </plugin>
             <plugin>
                 <!-- This plugin must be configured both here (for attach-javadoc during release)
                 and in "reports" (for site generation), preferably with identical version numbers. -->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.3</version>
+                <version>3.1.1</version>
                 <configuration>
-                    <!-- Turn off Java 8 strict Javadoc checking -->
-                    <additionalparam>-Xdoclint:none</additionalparam>
+                    <!-- Turn off strict Javadoc checking -->
+                    <doclint>none</doclint>
+                    <!--
+                      Exclude this package as it inherits from a JAI (https://www.oracle.com/technetwork/java/iio-141084.html) type
+                      whose sources are hard to discover by the JavaDoc tool.
+                    -->
+                    <excludePackageNames>org.opentripplanner.graph_builder.module.ned:*</excludePackageNames>
                 </configuration>
                 <executions>
                     <!-- Compress Javadoc into JAR and include that JAR when deploying. -->
@@ -231,7 +250,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.0.1</version>
+                <version>3.1.0</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -259,10 +278,29 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.21.0</version>
+                <!--
+                  Intentionally an old version as the combination of Junit 5, Java 11 and Surefire was causing issues.
+                  https://github.com/opentripplanner/OpenTripPlanner/pull/2812/commits/c811224f8467699ee70684e9f6b00d3ad803dbeb
+                -->
+                <version>2.19.1</version>
                 <configuration>
-                    <argLine>-Xmx2G</argLine>
-                    <argLine>-Dfile.encoding=UTF-8</argLine>
+                    <!-- we have to fork the JVM during tests so that the argLine is passed along -->
+                    <forkCount>3</forkCount>
+                    <!-- enable the restricted reflection under Java 11 so that the ObjectDiffer works -->
+                    <argLine>
+                        -Xmx2G
+                        -Dfile.encoding=UTF-8
+                        --illegal-access=permit
+                        --add-opens java.base/java.lang.module=ALL-UNNAMED
+                        --add-opens java.base/jdk.internal.reflect=ALL-UNNAMED
+                        --add-opens java.base/jdk.internal.misc=ALL-UNNAMED
+                        --add-opens java.base/jdk.internal.loader=ALL-UNNAMED
+                        --add-opens java.base/jdk.internal.ref=ALL-UNNAMED
+                        --add-opens java.base/jdk.internal.util=ALL-UNNAMED
+                        --add-opens java.base/jdk.internal.util.jar=ALL-UNNAMED
+                        --add-opens java.base/jdk.internal.module=ALL-UNNAMED
+                        --add-opens java.base/java.lang=ALL-UNNAMED
+                    </argLine>
                     <!-- Jenkins needs XML test reports to determine whether the build is stable. -->
                     <disableXmlReport>false</disableXmlReport>
                 </configuration>
@@ -310,7 +348,7 @@
                   properly if some input files are missing a terminating newline) -->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>2.2</version>
+                <version>3.2.1</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -390,10 +428,10 @@
                 (for attach-javadoc during release), preferably with identical version numbers. -->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.3</version>
+                <version>3.1.1</version>
                 <configuration>
                     <!-- Turn off Java 8 strict Javadoc checking -->
-                    <additionalparam>-Xdoclint:none</additionalparam>
+                    <doclint>false</doclint>
                 </configuration>
                 <reportSets>
                     <reportSet>
@@ -461,17 +499,17 @@
         <!-- GEOTOOLS includes JTS as a transitive dependency. -->
         <dependency>
             <groupId>org.geotools</groupId>
-            <artifactId>gt-geojson</artifactId>
+            <artifactId>gt-main</artifactId>
             <version>${geotools.version}</version>
         </dependency>
         <dependency>
             <groupId>org.geotools</groupId>
-            <artifactId>gt-referencing</artifactId>
+            <artifactId>gt-geojson</artifactId>
             <version>${geotools.version}</version>
         </dependency>
         <dependency>
             <groupId>org.geotools</groupId>
-            <artifactId>gt-referencing3D</artifactId>
+            <artifactId>gt-referencing</artifactId>
             <version>${geotools.version}</version>
         </dependency>
         <dependency>

src/main/java/org/opensphere/geometry/triangulation/DoubleComparator.java

@@ -35,7 +35,7 @@ public DoubleComparator(Map<QuadEdge,Double> map) {
 	 * @param qeB
 	 * 		quad edge to compare
 	 * @return
-	 * 		1 if double value associated to qeA  < double
+	 * 		1 if double value associated to qeA less than double
 	 * 		value associated to qeB,
 	 * 		0 if values are equals,
 	 * 		-1 otherwise

src/main/java/org/opentripplanner/analyst/batch/CSVPopulation.java

@@ -64,7 +64,7 @@ else if (CRS.getAxisOrder(destCrs) == CRS.AxisOrder.EAST_NORTH)
                 if (!destCrs.equals(sourceCrs)) {
                     transform = true;
 
-                    // find the transformation, being strict about datums &c.
+                    // find the transformation, being strict about datums etc.
                     mathTransform = CRS.findMathTransform(sourceCrs, destCrs, false);
                 }
             }

src/main/java/org/opentripplanner/analyst/core/Tile.java

@@ -30,10 +30,14 @@
  * Result is stored in image pixel as a signed byte.
  * 
  * So:
+ * <pre>
+ * {@code
  *  -119 to +119 are interpreted literally,
  *  +120 means >= +120,
  *  -120 means <= -120,
  *  -128 means "unreachable".
+ * }
+ * </pre>
  */
 public abstract class Tile {
 

src/main/java/org/opentripplanner/api/model/WalkStep.java

@@ -17,28 +17,34 @@
 /**
  * Represents one instruction in walking directions. Three examples from New York City:
  * <p>
- * Turn onto Broadway from W 57th St (coming from 7th Ave): <br/>
- * distance = 100 (say) <br/>
- * walkDirection = RIGHT <br/>
- * streetName = Broadway <br/>
- * everything else null/false <br/>
+ * Turn onto Broadway from W 57th St (coming from 7th Ave):
+ * <pre>
+ *  distance = 100 (say) 
+ *  walkDirection = RIGHT 
+ *  streetName = Broadway 
+ *  everything else null/false 
+ * </pre>
  * </p>
  * <p>
- * Now, turn from Broadway onto Central Park S via Columbus Circle <br/>
- * distance = 200 (say) <br/>
- * walkDirection = CIRCLE_COUNTERCLOCKWISE <br/>
- * streetName = Central Park S <br/>
- * exit = 1 (first exit) <br/>
- * immediately everything else false <br/>
+ * Now, turn from Broadway onto Central Park S via Columbus Circle
+ * <pre>
+ *  distance = 200 (say) 
+ *  walkDirection = CIRCLE_COUNTERCLOCKWISE 
+ *  streetName = Central Park S 
+ *  exit = 1 (first exit) 
+ *  immediately everything else false 
+ * </pre>
  * </p>
  * <p>
- * Instead, go through the circle to continue on Broadway <br/>
- * distance = 100 (say) <br/>
- * walkDirection = CIRCLE_COUNTERCLOCKWISE <br/>
- * streetName = Broadway <br/>
- * exit = 3 <br/>
- * stayOn = true <br/>
- * everything else false <br/>
+ * Instead, go through the circle to continue on Broadway
+ * <pre>
+ *  distance = 100 (say)
+ *  walkDirection = CIRCLE_COUNTERCLOCKWISE
+ *  streetName = Broadway
+ *  exit = 3
+ *  stayOn = true
+ *  everything else false
+ * </pre>
  * </p>
  * */
 public class WalkStep {

src/main/java/org/opentripplanner/api/resource/GraphInspectorTileResource.java

@@ -42,7 +42,7 @@
  * Tile rendering goes through TileRendererManager which select the appropriate renderer for the
  * given layer.
  * 
- * @see TileRendererManager
+ * @see org.opentripplanner.inspector.TileRendererManager
  * @see TileRenderer
  * 
  * @author laurent

src/main/java/org/opentripplanner/api/resource/LIsochrone.java

@@ -47,10 +47,10 @@
  * 
  * Example of request:
  * 
- * <code>
+ * {@code
  * http://localhost:8080/otp-rest-servlet/ws/isochrone?routerId=bordeaux&algorithm=accSampling&fromPlace=47.059,-0.880&date=2013/10/01&time=12:00:00&maxWalkDistance=1000&mode=WALK,TRANSIT&cutoffSec=1800&cutoffSec=3600
- * </code>
- * 
+ * }
+ *
  * @author laurent
  */
 @Path("/routers/{routerId}/isochrone")

src/main/java/org/opentripplanner/api/resource/Routers.java

@@ -62,7 +62,7 @@
  * For example:
  * 
  * GET http://localhost/otp-rest-servlet/ws/routers
- * will retrieve a list of all registered routerId -> Graph mappings and their geographic bounds.
+ * will retrieve a list of all registered routerId → Graph mappings and their geographic bounds.
  * 
  * GET http://localhost/otp-rest-servlet/ws/routers/london
  * will return status code 200 and a brief description of the 'london' graph including geographic 
@@ -112,7 +112,7 @@ public RouterList getRouterIds() {
 
     /** 
      * Returns the bounds for a specific routerId, or verifies whether it is registered. 
-     * @returns status code 200 if the routerId is registered, otherwise a 404.
+     * @return status code 200 if the routerId is registered, otherwise a 404.
      */
     @GET @Path("{routerId}")
     @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML + Q, MediaType.TEXT_XML + Q })

src/main/java/org/opentripplanner/api/resource/SIsochrone.java

@@ -97,9 +97,11 @@ public class SIsochrone extends RoutingResource {
      * and distortions towards an ellipse will appear if it is transformed/projected to the user location.
      * <p>
      * An example request may look like this:
+     * {@code
      * localhost:8080/otp-rest-servlet/ws/iso?layers=traveltime&styles=mask&batch=true&fromPlace=51.040193121307176
      * %2C-114.04471635818481&toPlace
-     * =51.09098935%2C-113.95179705&time=2012-06-06T08%3A00%3A00&mode=WALK&maxWalkDistance=10000&walkSpeed=1.38&walkTime=10.7&output=EDGES 
+     * =51.09098935%2C-113.95179705&time=2012-06-06T08%3A00%3A00&mode=WALK&maxWalkDistance=10000&walkSpeed=1.38&walkTime=10.7&output=EDGES
+     * }
      * Though the first parameters (i) layer, (ii) styles and (iii) batch could be discarded.
      * 
      * @param walkmins Maximum number of minutes to walk.

src/main/java/org/opentripplanner/api/resource/TimeGridWs.java

@@ -32,9 +32,9 @@
  * 
  * Example of request:
  * 
- * <code>
+ * {@code
  * http://localhost:8080/otp/routers/bordeaux/timegrid?fromPlace=47.059,-0.880&date=2013/10/01&time=12:00:00&maxWalkDistance=1000&maxTimeSec=3600&mode=WALK,TRANSIT
- * </code>
+ * }
  * 
  * @author laurent
  */

src/main/java/org/opentripplanner/common/RepeatingTimePeriod.java

@@ -5,7 +5,7 @@
 import java.util.TimeZone;
 
 /**
- * Represents a repeating time period, used for opening hours &c.
+ * Represents a repeating time period, used for opening hours etc.
  * For instance: Monday - Friday 8AM to 8PM, Satuday 10AM to 5PM, Sunday closed.
  * For now it is week-based so doesn't handle every possible case, but since it is encapsulated 
  * that could conceivably be changed.

src/main/java/org/opentripplanner/common/geometry/CompactElevationProfile.java

@@ -31,7 +31,7 @@ public final class CompactElevationProfile implements Serializable {
     /**
      * Compact an elevation profile onto a var-len int packed form (Dlugosz coding).
      * 
-     * @param profile The elevation profile to compact
+     * @param elevation The elevation profile to compact
      * @return The compacted format
      */
     public static byte[] compactElevationProfile(CoordinateSequence elevation) {

src/main/java/org/opentripplanner/common/geometry/CompactLineString.java

@@ -164,11 +164,6 @@ public static LineString uncompactLineString(double xa, double ya, double xb, do
     /**
      * Same as the other version, but in a var-len int packed form (Dlugosz coding).
      * 
-     * @param x0
-     * @param y0
-     * @param x1
-     * @param y1
-     * @param coords
      * @return
      */
     public static LineString uncompackLineString(double x0, double y0, double x1, double y1,

src/main/java/org/opentripplanner/common/geometry/PackedCoordinateSequence.java

@@ -338,7 +338,7 @@ public static class Float extends PackedCoordinateSequence {
         float[] coords;
 
         /**
-         * Constructs a packed coordinate sequence from an array of <code>float<code>s
+         * Constructs a packed coordinate sequence from an array of {@code float}s
          * 
          * @param coords
          * @param dimensions
@@ -356,7 +356,7 @@ public Float(float[] coords, int dimensions) {
         }
 
         /**
-         * Constructs a packed coordinate sequence from an array of <code>double<code>s
+         * Constructs a packed coordinate sequence from an array of ${@code double}s
          */
         public Float(double[] coordinates, int dimensions) {
             this.coords = new float[coordinates.length];

src/main/java/org/opentripplanner/graph_builder/module/GtfsFeedId.java

@@ -48,14 +48,15 @@ public Builder id(String id) {
 
         /**
          * Extracts a feed_id from the passed source for a GTFS feed.
-         * <p/>
+         * <p>
          * This will try to fetch the experimental feed_id field from the feed_info.txt file.
-         * <p/>
+         * </p>
+         * <p>
          * If the feed does not contain a feed_info.txt or a feed_id field a default GtfsFeedId will be created.
+         * </p>
          *
          * @param source the input source
          * @return A GtfsFeedId
-         * @throws IOException
          * @see <a href="http://developer.trimet.org/gtfs_ext.shtml">http://developer.trimet.org/gtfs_ext.shtml</a>
          */
         public Builder fromGtfsFeed(CsvInputSource source) {

src/main/java/org/opentripplanner/graph_builder/module/map/BusRouteStreetMatcher.java

@@ -23,8 +23,8 @@
  * Uses the shapes from GTFS to determine which streets buses drive on. This is used to improve the quality of
  * the stop-to-street linkage. It encourages the linker to link to streets where transit actually travels.
  *
- * GTFS provides a mapping from trips->shapes. This module provides a mapping from stops->trips and shapes->edges.
- * Then transitively we get a mapping from stop->edges.
+ * GTFS provides a mapping from trips→shapes. This module provides a mapping from stops→trips and shapes→edges.
+ * Then transitively we get a mapping from stop→edges.
  * The edges that "belong" to a stop are favored when linking that stop to the street network.
  */
 public class BusRouteStreetMatcher implements GraphBuilderModule {