Merge pull request #323 from vincent4vx/chore-update-dependencies

chore: Update dependencies for v0.11
Arakne · Jan 3, 2024 · 50f56a2 · 50f56a2
2 parents 0d07e80 + ced01be
commit 50f56a2
Show file tree

Hide file tree

Showing 11 changed files with 60 additions and 43 deletions.
diff --git a/checkstyle.xml b/checkstyle.xml
@@ -214,7 +214,7 @@
 
         <module name="JavadocContentLocationCheck" />
         <module name="JavadocMethod">
-            <property name="scope" value="public" />
+            <property name="accessModifiers" value="public" />
             <property name="allowMissingParamTags" value="true" />
             <property name="allowMissingReturnTag" value="true" />
         </module>

diff --git a/pom.xml b/pom.xml
@@ -34,22 +34,22 @@
 
     <groupId>fr.quatrevieux.araknemu</groupId>
     <artifactId>araknemu</artifactId>
-    <version>0.10-SNAPSHOT</version>
+    <version>0.11-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
-            <version>4.1.70.Final</version>
+            <version>4.1.104.Final</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.12.0</version>
+            <version>3.14.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-text</artifactId>
-            <version>1.10.0</version>
+            <version>1.11.0</version>
         </dependency>
         <dependency>
             <groupId>args4j</groupId>
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.17.1</version>
+            <version>2.22.1</version>
         </dependency>
         <dependency>
             <groupId>org.ini4j</groupId>
@@ -69,12 +69,13 @@
         <dependency>
             <groupId>org.mariadb.jdbc</groupId>
             <artifactId>mariadb-java-client</artifactId>
-            <version>3.1.4</version>
+            <version>3.3.2</version>
         </dependency>
         <dependency>
             <groupId>org.xerial</groupId>
             <artifactId>sqlite-jdbc</artifactId>
-            <version>3.41.2.2</version>
+            <!-- TODO See: https://github.com/xerial/sqlite-jdbc/pull/1035 -->
+            <version>3.42.0.1</version>
         </dependency>
         <dependency>
             <groupId>fr.arakne</groupId>
@@ -89,22 +90,22 @@
         <dependency>
             <groupId>com.github.seancfoley</groupId>
             <artifactId>ipaddress</artifactId>
-            <version>5.3.3</version>
+            <version>5.4.0</version>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy</artifactId>
-            <version>3.0.8</version>
+            <version>4.0.17</version>
         </dependency>
         <dependency>
             <groupId>org.checkerframework</groupId>
             <artifactId>checker-qual</artifactId>
-            <version>3.34.0</version> <!-- TODO property -->
+            <version>3.42.0</version> <!-- TODO property -->
         </dependency>
         <dependency>
             <groupId>org.checkerframework</groupId>
             <artifactId>checker-util</artifactId>
-            <version>3.34.0</version>
+            <version>3.42.0</version>
         </dependency>
         <dependency>
             <groupId>com.google.errorprone</groupId>
@@ -115,19 +116,19 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.8.2</version>
+            <version>5.10.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.8.2</version>
+            <version>5.10.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>4.1.0</version>
+            <version>4.11.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -143,12 +144,16 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
+                <version>3.2.3</version>
+<!--                <configuration>-->
+<!--                    <parallel>classes</parallel>-->
+<!--                    <forkCount>4</forkCount>-->
+<!--                </configuration>-->
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.1.2</version>
+                <version>3.3.0</version>
                 <configuration>
                     <archive>
                         <manifest>
@@ -162,7 +167,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.1.1</version>
+                <version>3.6.0</version>
                 <configuration>
                     <archive>
                         <manifest>
@@ -189,7 +194,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.4</version>
+                <version>0.8.11</version>
 
                 <executions>
                     <execution>
@@ -211,7 +216,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>3.1.1</version>
+                <version>3.3.1</version>
                 <configuration>
                     <configLocation>checkstyle.xml</configLocation>
                 </configuration>
@@ -266,18 +271,14 @@
                 <plugins>
                     <plugin>
                         <artifactId>maven-compiler-plugin</artifactId>
-                        <version>3.8.1</version>
+                        <version>3.12.1</version>
                         <configuration>
                             <fork>true</fork> <!-- Must fork or else JVM arguments are ignored. -->
-                            <compilerArguments>
-                                <Xmaxerrs>10000</Xmaxerrs>
-                                <Xmaxwarns>10000</Xmaxwarns>
-                            </compilerArguments>
                             <annotationProcessorPaths>
                                 <path>
                                     <groupId>org.checkerframework</groupId>
                                     <artifactId>checker</artifactId>
-                                    <version>3.21.2</version>
+                                    <version>3.42.0</version>
                                 </path>
                             </annotationProcessorPaths>
                             <annotationProcessors>
@@ -297,7 +298,7 @@
                 <dependency>
                     <groupId>org.checkerframework</groupId>
                     <artifactId>checker</artifactId>
-                    <version>3.21.2</version>
+                    <version>3.42.0</version>
                 </dependency>
             </dependencies>
         </profile>
@@ -323,6 +324,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-compiler-plugin</artifactId>
+                        <version>3.12.1</version>
                         <configuration>
                             <fork>true</fork>
                             <compilerArgs combine.children="append">

diff --git a/src/main/java/fr/quatrevieux/araknemu/common/account/AbstractLivingAccount.java b/src/main/java/fr/quatrevieux/araknemu/common/account/AbstractLivingAccount.java
@@ -69,6 +69,7 @@ public void detach() {
 
     @Override
     @EnsuresNonNullIf(expression = "session", result = true)
+    @SuppressWarnings("contracts.conditional.postcondition")
     public boolean isLogged() {
         return session != null && session.isAlive();
     }

diff --git a/src/main/java/fr/quatrevieux/araknemu/core/di/Container.java b/src/main/java/fr/quatrevieux/araknemu/core/di/Container.java
@@ -19,6 +19,8 @@
 
 package fr.quatrevieux.araknemu.core.di;
 
+import org.checkerframework.checker.nullness.qual.NonNull;
+
 /**
  * Dependency injection container
  */
@@ -78,7 +80,7 @@ public interface Container {
      * @return The scoped container
      * @see ScopedContainer
      */
-    public default <T> Container with(T value, Class<? super T>... interfaces) {
+    public default <T> Container with(@NonNull T value, Class<? super T>... interfaces) {
         return withAll(new ScopedContainer.Mapping<>(value, interfaces));
     }
 

diff --git a/src/main/java/fr/quatrevieux/araknemu/core/di/ScopedContainer.java b/src/main/java/fr/quatrevieux/araknemu/core/di/ScopedContainer.java
@@ -19,6 +19,8 @@
 
 package fr.quatrevieux.araknemu.core.di;
 
+import org.checkerframework.checker.nullness.qual.NonNull;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -88,11 +90,11 @@ public static ScopedContainer fromMapping(Container container, Mapping[] mapping
      *
      * @param <T> The base type
      */
-    public static final class Mapping<T> {
-        private final T value;
+    public static final class Mapping<@NonNull T> {
+        private final @NonNull T value;
         private final Class[] interfaces;
 
-        public Mapping(T value, Class<? super T>... interfaces) {
+        public Mapping(@NonNull T value, Class<? super T>... interfaces) {
             this.value = value;
             this.interfaces = interfaces;
         }

diff --git a/src/main/java/fr/quatrevieux/araknemu/game/account/GameAccount.java b/src/main/java/fr/quatrevieux/araknemu/game/account/GameAccount.java
@@ -176,7 +176,9 @@ public boolean checkAnswer(String input) {
      * @param message Message to show
      */
     public void kick(ServerMessage message) {
-        if (isLogged()) {
+        final GameSession session = this.session;
+
+        if (session != null && isLogged()) {
             session.send(message);
             session.close();
         }

diff --git a/src/main/java/fr/quatrevieux/araknemu/game/admin/server/Info.java b/src/main/java/fr/quatrevieux/araknemu/game/admin/server/Info.java
@@ -101,7 +101,7 @@ private String formatDuration(Duration duration) {
         return formatted.toString();
     }
 
-    @SuppressWarnings("array.access.unsafe.high.range") // Ignore out of range for units (I don't think that TB of RAM will be reached)
+    @SuppressWarnings({"array.access.unsafe.high.range", "array.access.unsafe.high"}) // Ignore out of range for units (I don't think that TB of RAM will be reached)
     private static String formatBytes(long bytes) {
         final long absB = bytes == Long.MIN_VALUE ? Long.MAX_VALUE : Math.abs(bytes);
 

diff --git a/src/main/java/fr/quatrevieux/araknemu/game/chat/channel/PrivateChannel.java b/src/main/java/fr/quatrevieux/araknemu/game/chat/channel/PrivateChannel.java
@@ -48,11 +48,13 @@ public boolean authorized(GamePlayer from) {
 
     @Override
     public void send(GamePlayer from, Message message) throws ChatException {
-        if (message.target() == null || !service.isOnline(message.target())) {
+        final String target = message.target();
+
+        if (target == null || !service.isOnline(target)) {
             throw new ChatException(ChatException.Error.USER_NOT_CONNECTED);
         }
 
-        final GamePlayer to = service.get(message.target());
+        final GamePlayer to = service.get(target);
         final ConcealedMessage event = new ConcealedMessage(
             from,
             to,

diff --git a/src/main/java/fr/quatrevieux/araknemu/game/exploration/ExplorationPlayer.java b/src/main/java/fr/quatrevieux/araknemu/game/exploration/ExplorationPlayer.java
@@ -242,9 +242,11 @@ public void changeCell(@IndexFor("this.map()") int cell) {
      * Leave the current map
      */
     public void leave() {
-        if (map != null) {
-            if (map.remove(this)) {
-                dispatch(new MapLeaved(map));
+        final ExplorationMap currentMap = map;
+
+        if (currentMap != null) {
+            if (currentMap.remove(this)) {
+                dispatch(new MapLeaved(currentMap));
             }
 
             map = null;

diff --git a/src/main/java/fr/quatrevieux/araknemu/game/exploration/interaction/action/ActionQueue.java b/src/main/java/fr/quatrevieux/araknemu/game/exploration/interaction/action/ActionQueue.java
@@ -78,12 +78,14 @@ public void push(Action action) {
      * @param actionId The action to end
      */
     public void end(int actionId) {
+        final BlockingAction current = this.current;
+
         if (current == null || current.id() != actionId) {
             throw new NoSuchElementException("The action ID do not corresponds");
         }
 
         current.end();
-        current = null;
+        this.current = null;
 
         runNextAction();
     }
@@ -95,14 +97,16 @@ public void end(int actionId) {
      * @param argument The cancel argument
      */
     public void cancel(int actionId, String argument) {
+        final BlockingAction current = this.current;
+
         if (current == null || current.id() != actionId) {
             throw new NoSuchElementException("The action ID do not corresponds");
         }
 
         try {
             current.cancel(argument);
         } finally {
-            current = null;
+            this.current = null;
             actions.clear();
         }
     }

diff --git a/...main/java/fr/quatrevieux/araknemu/game/fight/ai/simulation/effect/StealLifeSimulator.java b/...main/java/fr/quatrevieux/araknemu/game/fight/ai/simulation/effect/StealLifeSimulator.java
@@ -49,10 +49,10 @@ public void simulate(CastSimulation simulation, AI ai, CastScope.EffectScope<? e
         // Poison is already handled by the DamageSimulator
         simulator.simulate(simulation, ai, effect);
 
-        final double totalDamage = (-simulation.alliesLife() - simulation.enemiesLife()) - lastDamage;
+        final int totalDamage = (int) ((-simulation.alliesLife() - simulation.enemiesLife()) - lastDamage);
 
         if (totalDamage > 0) {
-            simulation.addHeal(Interval.of((int) totalDamage / 2), simulation.caster());
+            simulation.addHeal(Interval.of(totalDamage / 2), simulation.caster());
         }
     }