From 2b5a5936ed56ac6a86769916fdf669d96871a4d7 Mon Sep 17 00:00:00 2001
From: Brutus5000 <brutus5000@gmx.net>
Date: Sun, 26 Nov 2023 14:59:11 +0100
Subject: [PATCH] Remove historic Elide includes (no longer available)

Fixes #195
---
 .idea/compiler.xml                            |  7 ++-----
 .idea/jarRepositories.xml                     | 20 +++++++++----------
 .idea/misc.xml                                |  1 +
 .idea/modules.xml                             |  1 -
 build.gradle                                  |  2 +-
 .../api/domain/UserService.java               |  2 --
 6 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 5b964c2..ddf8cff 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -7,17 +7,14 @@
         <outputRelativeToContentRoot value="true" />
         <option name="mapstruct.defaultComponentModel" value="jsr330" />
         <processorPath useClasspath="false">
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.springframework.boot/spring-boot-configuration-processor/3.1.2/613d07277e91a8ed609d45f6b528809eadd1fef7/spring-boot-configuration-processor-3.1.2.jar" />
-          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.projectlombok/lombok/1.18.28/a2ff5da8bcd8b1b26f36b806ced63213362c6dcc/lombok-1.18.28.jar" />
+          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.springframework.boot/spring-boot-configuration-processor/3.1.5/c2d86601444174123b1413e06051a5b9eb0576/spring-boot-configuration-processor-3.1.5.jar" />
+          <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.projectlombok/lombok/1.18.30/f195ee86e6c896ea47a1d39defbe20eb59cd149d/lombok-1.18.30.jar" />
           <entry name="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.mapstruct/mapstruct-processor/1.5.5.Final/897f6f115930b936287bef552bf5fe28cc64717d/mapstruct-processor-1.5.5.Final.jar" />
         </processorPath>
         <module name="com.faforever.faf-moderator-client.main" />
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel>
-      <module name="com.faforever.faf-moderator-client" target="17" />
-      <module name="com.faforever.faf-moderator-client.main" target="17" />
-      <module name="com.faforever.faf-moderator-client.test" target="17" />
       <module name="dev.faf-moderator-client" target="11" />
       <module name="dev.faf-moderator-client.main" target="11" />
       <module name="dev.faf-moderator-client.test" target="11" />
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index f5a0c5d..96bf7c0 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -1,6 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://jitpack.io" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenRepo" />
+      <option name="name" value="MavenRepo" />
+      <option name="url" value="https://repo.maven.apache.org/maven2/" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
       <option name="name" value="Maven Central repository" />
@@ -11,15 +21,5 @@
       <option name="name" value="JBoss Community repository" />
       <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
     </remote-repository>
-    <remote-repository>
-      <option name="id" value="MavenRepo" />
-      <option name="name" value="MavenRepo" />
-      <option name="url" value="https://repo.maven.apache.org/maven2/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="maven" />
-      <option name="name" value="maven" />
-      <option name="url" value="https://jitpack.io" />
-    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 822b4bf..c4be380 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index bf45ccf..54846f0 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,6 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/modules/com.faforever.faf-moderator-client.iml" filepath="$PROJECT_DIR$/.idea/modules/com.faforever.faf-moderator-client.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/com.faforever.faf-moderator-client.main.iml" filepath="$PROJECT_DIR$/.idea/modules/com.faforever.faf-moderator-client.main.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/com.faforever.faf-moderator-client.test.iml" filepath="$PROJECT_DIR$/.idea/modules/com.faforever.faf-moderator-client.test.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/dev.faf-moderator-client.iml" filepath="$PROJECT_DIR$/.idea/modules/dev.faf-moderator-client.iml" />
diff --git a/build.gradle b/build.gradle
index f975b3c..84fdcdb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -35,7 +35,7 @@ println "Platform is: ${javafxPlatform}"
 dependencies {
     def springBootVersion = "3.1.5"
     def mapStructVersion = "1.5.5.Final"
-    def commonsVersion = "9a877cee8c77ea89f35995c326702c173036e048"
+    def commonsVersion = "deb598d"
 
     annotationProcessor(platform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}"))
     implementation(platform("org.springframework.boot:spring-boot-dependencies:${springBootVersion}"))
diff --git a/src/main/java/com/faforever/moderatorclient/api/domain/UserService.java b/src/main/java/com/faforever/moderatorclient/api/domain/UserService.java
index 2401a81..901d12f 100644
--- a/src/main/java/com/faforever/moderatorclient/api/domain/UserService.java
+++ b/src/main/java/com/faforever/moderatorclient/api/domain/UserService.java
@@ -56,8 +56,6 @@ private <T extends ElideEntity> ElideNavigatorOnCollection<T> addModeratorInclud
 
         return builder
                 .addInclude(variablePrefix + "names")
-                .addInclude(variablePrefix + "globalRating")
-                .addInclude(variablePrefix + "ladder1v1Rating")
                 .addInclude(variablePrefix + "avatarAssignments")
                 .addInclude(variablePrefix + "avatarAssignments.avatar")
                 .addInclude(variablePrefix + "uniqueIds")