Update to Java 10

.travis.yml

@@ -1,7 +1,7 @@
 language: java
 
 jdk:
-  - oraclejdk9
+  - oraclejdk10
 
 services:
   - docker

build.gradle

@@ -3,6 +3,6 @@ subprojects {
   group = 'com.faforever.server'
   version = '1.3'
 
-  sourceCompatibility = 1.9
-  targetCompatibility = 1.9
+  sourceCompatibility = 1.10
+  targetCompatibility = 1.10
 }

faf-java-server-app/build.gradle

@@ -53,9 +53,15 @@ processResources {
 
 apply plugin: 'jacoco'
 apply plugin: 'com.github.kt3k.coveralls'
+
+jacoco {
+  toolVersion = '0.8.1'
+}
+
 jacocoTestReport {
   reports {
     xml.enabled = true
+
   }
 }
 
@@ -119,11 +125,13 @@ dependencies {
 
   optional("org.springframework.boot:spring-boot-devtools")
   optional("org.springframework.boot:spring-boot-configuration-processor")
-  optional("org.projectlombok:lombok:${lombokVersion}")
   optional("org.mapstruct:mapstruct-processor:${mapstructVersion}")
   optional("com.github.javaparser:javaparser-core:3.6.3")
   optional("com.github.javaparser:javaparser-symbol-solver-core:3.6.0")
 
+  compileOnly("org.projectlombok:lombok:${lombokVersion}")
+  annotationProcessor("org.projectlombok:lombok:${lombokVersion}")
+
   testCompile("org.springframework.boot:spring-boot-starter-test")
   testCompile("com.googlecode.zohhak:zohhak:${zohhakVersion}")
 

faf-java-server-app/src/main/java/com/faforever/server/entity/GamePlayerStats.java

@@ -19,8 +19,8 @@
 @Entity
 @Table(name = "game_player_stats")
 @Immutable
-@Data
 @NoArgsConstructor
+@Data
 @EqualsAndHashCode(of = "id")
 @Cacheable
 public class GamePlayerStats {

faf-java-server-app/src/main/java/com/faforever/server/entity/GlobalRating.java

@@ -2,17 +2,19 @@
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.Setter;
 import lombok.ToString;
 
 import javax.persistence.Entity;
 import javax.persistence.Table;
 
 @Entity
 @Table(name = "global_rating")
+@NoArgsConstructor
 @Data
 @EqualsAndHashCode(callSuper = true)
-@NoArgsConstructor
 @ToString(callSuper = true)
 public class GlobalRating extends Rating {
   public GlobalRating(Player player, double mean, double deviation) {

faf-java-server-app/src/main/java/com/faforever/server/game/GameResponse.java

@@ -34,6 +34,7 @@ public class GameResponse implements ServerMessage {
   public static class Player {
     private final int id;
     /** @deprecated used by the legacy protocol, will be removed in future. */
+    @Deprecated
     private final String name;
     private final int team;
   }

faf-java-server-app/src/main/java/com/faforever/server/integration/v2/client/CreateMatchClientMessage.java

@@ -35,6 +35,10 @@ class CreateMatchClientMessage extends V2ClientMessage {
   @NotNull
   private String featuredMod;
 
+  /** Specifies in which lobby mode the game has to be started in. */
+  @NotNull
+  private LobbyMode lobbyMode;
+
   /** The players who will participate in this match. */
   @NotNull
   private List<Participant> participants;
@@ -66,4 +70,14 @@ public static class Participant {
     /** ID of the slot on the map the player will start in. */
     int startSpot;
   }
+
+  /** See values for description. */
+  public enum LobbyMode {
+
+    /** Default lobby where players can select their faction, teams and so on. */
+    DEFAULT,
+
+    /** The lobby is skipped; the game starts straight away, */
+    NONE
+  }
 }

faf-java-server-app/src/main/java/com/faforever/server/matchmaker/CreateMatchRequest.java

@@ -23,20 +23,8 @@ public class CreateMatchRequest implements ClientMessage {
   private List<Participant> participants;
   private LobbyMode lobbyMode;
 
-  /**
-   * See values for description.
-   */
   public enum LobbyMode {
-
-    /**
-     * Default lobby where players can select their faction, teams and so on.
-     */
-    DEFAULT,
-
-    /**
-     * The lobby is skipped; the game starts straight away,
-     */
-    NONE
+    DEFAULT, NONE
   }
 
   @Getter

faf-java-server-app/src/main/java/com/faforever/server/player/PlayerOfflineEvent.java

@@ -5,7 +5,7 @@
 import lombok.EqualsAndHashCode;
 import org.springframework.context.ApplicationEvent;
 
-@Data
+@Data()
 @EqualsAndHashCode(callSuper = true)
 public class PlayerOfflineEvent extends ApplicationEvent {
   private final Player player;

faf-java-server-apt/build.gradle

@@ -10,8 +10,8 @@ dependencies {
 
   implementation project(":faf-java-server-annotations")
 
-  annotationProcessor("org.projectlombok:lombok:1.16.20")
-  compileOnly("org.projectlombok:lombok:1.16.20")
+  annotationProcessor("org.projectlombok:lombok:${lombokVersion}")
+  compileOnly("org.projectlombok:lombok:${lombokVersion}")
 
   annotationProcessor("com.google.auto.service:auto-service:1.0-rc4")
   compileOnly("com.google.auto.service:auto-service:1.0-rc4")

faf-java-server-apt/src/main/java/com/faforever/server/apt/V2ProtocolDocGenerator.java

@@ -60,7 +60,7 @@
 
 @SupportedAnnotationTypes("com.faforever.server.annotations.*")
 @AutoService(Processor.class)
-@SupportedSourceVersion(SourceVersion.RELEASE_9)
+@SupportedSourceVersion(SourceVersion.RELEASE_10)
 public class V2ProtocolDocGenerator extends AbstractProcessor {
 
   private static final Pattern CODE_PATTERN = Pattern.compile("\\{@code (.*?)}", Pattern.DOTALL);

gradle.properties

@@ -9,7 +9,7 @@ javaxInterceptorApiVersion=1.2
 guavaVersion=24.1-jre
 jetbrainsAnnotationsVersion=16.0.1
 mysqlConnectorVersion=8.0.9-rc
-lombokVersion=1.16.20
+lombokVersion=1.18.0
 geoip2Version=2.8.0
 noCatchVersion=1.1
 jSkillsVersion=24ddb058a6

readme.md

@@ -37,7 +37,7 @@ Given the number of required configuration values, it's easiest to run the serve
 
 This project uses:
 
-* Java 8 as the programming language
+* Java 10 as the programming language
 * [Spring Boot](https://projects.spring.io/spring-boot/) as a base framework
 * [Spring Integration](https://projects.spring.io/spring-integration/) as a messaging framework
 * [Gradle](https://gradle.org/) as a build automation tool