Move API DTOs back to faf-java-commons

build.gradle

@@ -1,3 +1,5 @@
+import org.gradle.internal.os.OperatingSystem
+
 buildscript {
     repositories {
         jcenter()
@@ -22,12 +24,23 @@ compileJava() {
     options.compilerArgs << "-Amapstruct.defaultComponentModel=jsr330"
 }
 
+project.ext.javafxPlatform = "${javafxPlatform}"
+
 if (javafxPlatform == "unspecified") {
-    throw new InvalidUserDataException("javafxPlatform unspecified! Must be one of [linux,mac,win]")
-} else {
-    project.ext.javafxPlatform = "${javafxPlatform}"
+    switch (OperatingSystem.current()) {
+        case OperatingSystem.LINUX:
+            project.ext.javafxPlatform = "linux"
+            break
+        case OperatingSystem.MAC_OS:
+            project.ext.javafxPlatform = "mac"
+            break
+        case OperatingSystem.WINDOWS:
+            project.ext.javafxPlatform = "win"
+            break
+    }
     println "Platform is: ${javafxPlatform}"
 }
+println "Platform is: ${javafxPlatform}"
 
 dependencies {
     annotationProcessor(platform("org.springframework.boot:spring-boot-dependencies:2.1.11.RELEASE"))
@@ -43,8 +56,8 @@ dependencies {
     implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
     implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8'
     implementation 'com.github.jasminb:jsonapi-converter:0.9'
-    implementation 'com.github.FAForever.faf-java-commons:faf-commons-data:4ca1f75'
-    implementation 'com.github.FAForever.faf-java-commons:faf-commons-api:4ca1f75'
+    implementation 'com.github.FAForever.faf-java-commons:faf-commons-data:cc8c606a'
+    implementation 'com.github.FAForever.faf-java-commons:faf-commons-api:cc8c606a'
     implementation 'com.github.micheljung:nocatch:1.1'
     implementation 'org.apache.httpcomponents:httpclient:4.5.9'
     implementation 'com.github.rutledgepaulv:q-builders:1.6'

src/main/java/com/faforever/moderatorclient/api/FafApiCommunicationService.java

@@ -1,11 +1,11 @@
 package com.faforever.moderatorclient.api;
 
+import com.faforever.commons.api.dto.MeResult;
+import com.faforever.commons.api.dto.update.UpdateDto;
 import com.faforever.commons.api.elide.ElideEntity;
 import com.faforever.commons.api.elide.ElideNavigator;
 import com.faforever.commons.api.elide.ElideNavigatorOnCollection;
 import com.faforever.commons.api.elide.ElideNavigatorOnId;
-import com.faforever.moderatorclient.api.dto.get.MeResult;
-import com.faforever.moderatorclient.api.dto.update.UpdateDto;
 import com.faforever.moderatorclient.api.event.FafApiFailGetEvent;
 import com.faforever.moderatorclient.api.event.FafApiFailModifyEvent;
 import com.faforever.moderatorclient.mapstruct.CycleAvoidingMappingContext;
@@ -18,11 +18,7 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
+import org.springframework.http.*;
 import org.springframework.security.oauth2.client.OAuth2RestTemplate;
 import org.springframework.security.oauth2.client.resource.OAuth2AccessDeniedException;
 import org.springframework.security.oauth2.client.token.grant.password.ResourceOwnerPasswordResourceDetails;
@@ -35,11 +31,7 @@
 
 import java.io.Serializable;
 import java.lang.reflect.Array;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.CountDownLatch;
 import java.util.stream.Collectors;
 

src/main/java/com/faforever/moderatorclient/api/domain/AvatarService.java

@@ -2,12 +2,12 @@
 
 import com.faforever.commons.api.dto.Avatar;
 import com.faforever.commons.api.dto.AvatarAssignment;
+import com.faforever.commons.api.dto.update.AvatarAssignmentUpdate;
 import com.faforever.commons.api.elide.ElideNavigator;
 import com.faforever.commons.api.elide.ElideNavigatorOnCollection;
 import com.faforever.commons.api.elide.ElideNavigatorOnId;
 import com.faforever.moderatorclient.api.FafApiCommunicationService;
-import com.faforever.moderatorclient.api.dto.get.AvatarMetadata;
-import com.faforever.moderatorclient.api.dto.update.AvatarAssignmentUpdate;
+import com.faforever.moderatorclient.api.dto.update.AvatarMetadata;
 import com.faforever.moderatorclient.mapstruct.AvatarAssignmentMapper;
 import com.faforever.moderatorclient.ui.domain.AvatarAssignmentFX;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/faforever/moderatorclient/api/dto/get/AvatarMetadata.java → src/main/java/com/faforever/moderatorclient/api/dto/update/AvatarMetadata.java

@@ -1,4 +1,4 @@
-package com.faforever.moderatorclient.api.dto.get;
+package com.faforever.moderatorclient.api.dto.update;
 
 import lombok.Data;
 

src/main/java/com/faforever/moderatorclient/mapstruct/TeamKillReportMapper.java

@@ -1,7 +1,7 @@
 package com.faforever.moderatorclient.mapstruct;
 
+import com.faforever.commons.api.dto.TeamkillReport;
 import com.faforever.moderatorclient.api.domain.TeamKillReportFx;
-import com.faforever.moderatorclient.api.dto.get.TeamkillReport;
 import org.mapstruct.Mapper;
 
 import java.util.List;

src/main/java/com/faforever/moderatorclient/ui/LoginController.java

@@ -1,7 +1,7 @@
 package com.faforever.moderatorclient.ui;
 
+import com.faforever.commons.api.dto.MeResult;
 import com.faforever.moderatorclient.api.FafApiCommunicationService;
-import com.faforever.moderatorclient.api.dto.get.MeResult;
 import javafx.fxml.FXML;
 import javafx.scene.control.DialogPane;
 import javafx.scene.control.Label;

src/main/java/com/faforever/moderatorclient/ui/MainController.java

@@ -1,7 +1,7 @@
 package com.faforever.moderatorclient.ui;
 
+import com.faforever.commons.api.dto.GroupPermission;
 import com.faforever.moderatorclient.api.FafApiCommunicationService;
-import com.faforever.moderatorclient.api.dto.get.GroupPermission;
 import com.faforever.moderatorclient.api.event.FafApiFailGetEvent;
 import com.faforever.moderatorclient.api.event.FafApiFailModifyEvent;
 import com.faforever.moderatorclient.ui.main_window.AvatarsController;

src/main/java/com/faforever/moderatorclient/ui/main_window/RecentActivityController.java

@@ -1,9 +1,9 @@
 package com.faforever.moderatorclient.ui.main_window;
 
+import com.faforever.commons.api.dto.GroupPermission;
 import com.faforever.moderatorclient.api.FafApiCommunicationService;
 import com.faforever.moderatorclient.api.domain.MapService;
 import com.faforever.moderatorclient.api.domain.UserService;
-import com.faforever.moderatorclient.api.dto.get.GroupPermission;
 import com.faforever.moderatorclient.ui.BanInfoController;
 import com.faforever.moderatorclient.ui.Controller;
 import com.faforever.moderatorclient.ui.UiService;

src/main/java/com/faforever/moderatorclient/ui/main_window/UserManagementController.java

@@ -1,26 +1,13 @@
 package com.faforever.moderatorclient.ui.main_window;
 
+import com.faforever.commons.api.dto.GroupPermission;
+import com.faforever.commons.api.dto.update.AvatarAssignmentUpdate;
 import com.faforever.moderatorclient.api.FafApiCommunicationService;
 import com.faforever.moderatorclient.api.domain.AvatarService;
 import com.faforever.moderatorclient.api.domain.UserService;
-import com.faforever.moderatorclient.api.dto.get.GroupPermission;
-import com.faforever.moderatorclient.api.dto.update.AvatarAssignmentUpdate;
 import com.faforever.moderatorclient.mapstruct.GamePlayerStatsMapper;
-import com.faforever.moderatorclient.ui.BanInfoController;
-import com.faforever.moderatorclient.ui.Controller;
-import com.faforever.moderatorclient.ui.PlatformService;
-import com.faforever.moderatorclient.ui.UiService;
-import com.faforever.moderatorclient.ui.UserNoteController;
-import com.faforever.moderatorclient.ui.ViewHelper;
-import com.faforever.moderatorclient.ui.domain.AvatarAssignmentFX;
-import com.faforever.moderatorclient.ui.domain.AvatarFX;
-import com.faforever.moderatorclient.ui.domain.BanInfoFX;
-import com.faforever.moderatorclient.ui.domain.FeaturedModFX;
-import com.faforever.moderatorclient.ui.domain.GamePlayerStatsFX;
-import com.faforever.moderatorclient.ui.domain.NameRecordFX;
-import com.faforever.moderatorclient.ui.domain.PlayerFX;
-import com.faforever.moderatorclient.ui.domain.TeamkillFX;
-import com.faforever.moderatorclient.ui.domain.UserNoteFX;
+import com.faforever.moderatorclient.ui.*;
+import com.faforever.moderatorclient.ui.domain.*;
 import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.ObjectProperty;
@@ -30,13 +17,7 @@
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.scene.Scene;
-import javafx.scene.control.Button;
-import javafx.scene.control.ChoiceBox;
-import javafx.scene.control.RadioButton;
-import javafx.scene.control.SplitPane;
-import javafx.scene.control.Tab;
-import javafx.scene.control.TableView;
-import javafx.scene.control.TextField;
+import javafx.scene.control.*;
 import javafx.stage.Stage;
 import javafx.util.StringConverter;
 import lombok.RequiredArgsConstructor;