Merge branch 'release/0.2.0'

.gitignore

@@ -1,24 +1,23 @@
 target/
 !.mvn/wrapper/maven-wrapper.jar
 
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-
 ### IntelliJ IDEA ###
-.idea
 *.iws
 *.iml
 *.ipr
 
-### NetBeans ###
-nbproject/private/
-build/
-nbbuild/
-dist/
-nbdist/
-.nb-gradle/
+# User-specific stuff:
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/dictionaries
+.idea/sonarIssues.xml
+
+# Sensitive or high-churn files:
+.idea/dataSources
+.idea/dataSources.ids
+.idea/dataSources.xml
+.idea/sqlDataSources.xml
+.idea/dynamic.xml
+.idea/uiDesigner.xml
+.idea/inspectionProfiles/
+.idea/libraries

README.md

@@ -23,4 +23,4 @@ This application enables faforever.com moderators to perform administrative acti
 1. Import the project into IntelliJ as "Maven Project"
 1. Make sure you have the IntelliJ [Lombok plugin](https://plugins.jetbrains.com/idea/plugin/6317-lombok-plugin) installed
 1. Make sure you have `Enable annotation processing` enabled in the settings
-1. Add the dev profile as command line options ("VM options" in IntelliJ) using `-Dspring.profiles.active=dev`
+1. Add the dev profile as command line options ("VM options" in IntelliJ) using `-Dspring.profiles.active=dev`

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.faforever</groupId>
     <artifactId>faf-moderator-client</artifactId>
-    <version>0.1.2</version>
+    <version>0.2.0</version>
     <packaging>jar</packaging>
 
     <name>faf-moderator-client</name>
@@ -22,6 +22,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
+
+        <org.mapstruct.version>1.2.0.Final</org.mapstruct.version>
     </properties>
 
     <repositories>
@@ -86,6 +88,17 @@
             <artifactId>lombok</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct-processor</artifactId>
+            <version>${org.mapstruct.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct-jdk8</artifactId>
+            <version>${org.mapstruct.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -99,6 +112,33 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.5.1</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>1.16.18</version>
+                        </path>
+                        <path>
+                            <groupId>org.mapstruct</groupId>
+                            <artifactId>mapstruct-processor</artifactId>
+                            <version>${org.mapstruct.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                    <compilerArgs>
+                        <compilerArg>
+                            <!-- Note: add this to your IntelliJ compiler arguments -->
+                            -Amapstruct.defaultComponentModel=jsr330
+                        </compilerArg>
+                    </compilerArgs>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

src/main/java/com/faforever/moderatorclient/FafModeratorClientApplication.java

@@ -1,8 +1,6 @@
 package com.faforever.moderatorclient;
 
-import com.faforever.moderatorclient.ui.MainController;
-import com.faforever.moderatorclient.ui.StageHolder;
-import com.faforever.moderatorclient.ui.UiService;
+import com.faforever.moderatorclient.ui.*;
 import javafx.application.Application;
 import javafx.scene.Scene;
 import javafx.scene.image.Image;
@@ -12,6 +10,7 @@
 import org.springframework.boot.autoconfigure.jmx.JmxAutoConfiguration;
 import org.springframework.boot.autoconfigure.security.SecurityAutoConfiguration;
 import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.Bean;
 
 @SpringBootApplication(exclude = {
         JmxAutoConfiguration.class,
@@ -44,4 +43,9 @@ public void start(Stage primaryStage) throws Exception {
         primaryStage.setScene(new Scene(mainController.getRoot()));
         primaryStage.show();
     }
+
+    @Bean
+    public PlatformService platformService() {
+        return new PlatformServiceImpl(getHostServices());
+    }
 }

src/main/java/com/faforever/moderatorclient/api/dto/AbstractEntity.java

@@ -3,10 +3,12 @@
 import com.github.jasminb.jsonapi.annotations.Id;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
+import lombok.Setter;
 
 import java.time.OffsetDateTime;
 
 @Getter
+@Setter
 @EqualsAndHashCode(of = "id")
 public abstract class AbstractEntity {
     @Id

src/main/java/com/faforever/moderatorclient/api/dto/DomainBlacklist.java

@@ -0,0 +1,17 @@
+package com.faforever.moderatorclient.api.dto;
+
+import com.github.jasminb.jsonapi.annotations.Id;
+import com.github.jasminb.jsonapi.annotations.Type;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+@RestrictedVisibility("IsModerator")
+@Getter
+@Setter
+@EqualsAndHashCode(of = "domain")
+@Type("domainBlacklist")
+public class DomainBlacklist {
+    @Id
+    String domain;
+}

src/main/java/com/faforever/moderatorclient/api/dto/GamePlayerStats.java

@@ -30,8 +30,8 @@ public class GamePlayerStats {
     @Nullable
     private OffsetDateTime scoreTime;
 
-    @Relationship("replay")
-    private Game replay;
+    @Relationship("game")
+    private Game game;
 
     @Relationship("player")
     private Player player;

src/main/java/com/faforever/moderatorclient/api/dto/Map.java

@@ -1,5 +1,6 @@
 package com.faforever.moderatorclient.api.dto;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.github.jasminb.jsonapi.annotations.Id;
 import com.github.jasminb.jsonapi.annotations.Relationship;
 import com.github.jasminb.jsonapi.annotations.Type;
@@ -31,8 +32,10 @@ public class Map {
     private MapStatistics statistics;
 
     @Relationship("latestVersion")
+    @JsonIgnore
     private MapVersion latestVersion;
 
     @Relationship("versions")
+    @JsonIgnore
     private List<MapVersion> versions;
 }

src/main/java/com/faforever/moderatorclient/api/dto/MapVersion.java

@@ -1,38 +1,29 @@
 package com.faforever.moderatorclient.api.dto;
 
-import com.github.jasminb.jsonapi.annotations.Id;
 import com.github.jasminb.jsonapi.annotations.Relationship;
 import com.github.jasminb.jsonapi.annotations.Type;
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 import org.apache.maven.artifact.versioning.ComparableVersion;
 import org.jetbrains.annotations.Nullable;
 
 import java.net.URL;
-import java.time.OffsetDateTime;
 import java.util.List;
 
 @Getter
 @Setter
-@EqualsAndHashCode(of = "id")
 @Type("mapVersion")
-public class MapVersion {
-
-    @Id
-    private String id;
+public class MapVersion extends AbstractEntity {
     private String description;
-    private int maxPlayers;
-    private int width;
-    private int height;
+    private Integer maxPlayers;
+    private Integer width;
+    private Integer height;
     private ComparableVersion version;
     private String folderName;
     // TODO name consistently with folderName
     private String filename;
     private boolean ranked;
     private boolean hidden;
-    private OffsetDateTime createTime;
-    private OffsetDateTime updateTime;
     private URL thumbnailUrlSmall;
     private URL thumbnailUrlLarge;
     private URL downloadUrl;

src/main/java/com/faforever/moderatorclient/api/dto/Player.java

@@ -1,23 +1,17 @@
 package com.faforever.moderatorclient.api.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.github.jasminb.jsonapi.annotations.Id;
 import com.github.jasminb.jsonapi.annotations.Relationship;
 import com.github.jasminb.jsonapi.annotations.Type;
-import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.time.OffsetDateTime;
 import java.util.List;
 
 @Getter
 @Setter
-@EqualsAndHashCode(of = "id")
 @Type("player")
-public class Player {
-    @Id
-    private String id;
+public class Player extends AbstractEntity {
     private String login;
     @Relationship("names")
     List<NameRecord> names;
@@ -28,8 +22,6 @@ public class Player {
     private String steamId;
     @RestrictedVisibility("IsModerator")
     private String recentIpAddress;
-    private OffsetDateTime createTime;
-    private OffsetDateTime updateDateTime;
 
     @Relationship("globalRating")
     private GlobalRating globalRating;

src/main/java/com/faforever/moderatorclient/api/dto/UserNote.java

@@ -0,0 +1,19 @@
+package com.faforever.moderatorclient.api.dto;
+
+import com.github.jasminb.jsonapi.annotations.Relationship;
+import com.github.jasminb.jsonapi.annotations.Type;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@Type("userNote")
+@RestrictedVisibility("IsModerator")
+public class UserNote extends AbstractEntity {
+    @Relationship("player")
+    private Player player;
+    @Relationship("author")
+    private Player author;
+    private boolean watched;
+    private String note;
+}