⬆️ Update a bunch of dependencies

[rhynodge.git] / src / main / java / net / pterodactylus / rhynodge / states / StateManager.java

diff --git a/src/main/java/net/pterodactylus/rhynodge/states/StateManager.java b/src/main/java/net/pterodactylus/rhynodge/states/StateManager.java
index a52e74d..9b46feb 100644 (file)
--- a/src/main/java/net/pterodactylus/rhynodge/states/StateManager.java
+++ b/src/main/java/net/pterodactylus/rhynodge/states/StateManager.java
@@ -17,15 +17,21 @@
 
 package net.pterodactylus.rhynodge.states;
 
-import static com.google.common.base.Optional.absent;
-import static com.google.common.base.Optional.fromNullable;
+import static java.util.Optional.empty;
+import static java.util.Optional.ofNullable;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Optional;
+
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.fasterxml.jackson.module.kotlin.KotlinModule;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
 
 import net.pterodactylus.rhynodge.State;
 
-import com.google.common.base.Optional;
 import org.apache.log4j.Logger;
 
 import com.fasterxml.jackson.core.JsonGenerationException;
@@ -38,6 +44,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
+@Singleton
 public class StateManager {
 
        /** The logger. */
@@ -46,17 +53,24 @@ public class StateManager {
        /** Jackson object mapper. */
        private final ObjectMapper objectMapper = new ObjectMapper();
 
+       {
+               objectMapper.registerModule(new KotlinModule.Builder().build());
+               objectMapper.registerModule(new JavaTimeModule());
+               objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+       }
+
        /** The directory in which to store states. */
        private final String directory;
 
        /**
         * Creates a new state manager. The given directory is assumed to exist.
         *
-        * @param directory
+        * @param stateDirectory
         *            The directory to store states in
         */
-       public StateManager(String directory) {
-               this.directory = directory;
+       @Inject
+       public StateManager(StateDirectory stateDirectory) {
+               this.directory = stateDirectory.getDirectory();
        }
 
        //
@@ -68,7 +82,7 @@ public class StateManager {
         *
         * @param reactionName
         *            The name of the reaction
-        * @return The loaded state, or {@link Optional#absent()} if the state could not be
+        * @return The loaded state, or {@link Optional#empty()} if the state could not be
         *         loaded
         */
        public Optional<State> loadLastState(String reactionName) {
@@ -80,7 +94,7 @@ public class StateManager {
         *
         * @param reactionName
         *            The name of the reaction
-        * @return The loaded state, or {@link Optional#absent()} if the state could not be
+        * @return The loaded state, or {@link Optional#empty()} if the state could not be
         *         loaded
         */
        public Optional<State> loadLastSuccessfulState(String reactionName) {
@@ -141,14 +155,14 @@ public class StateManager {
         * @param successful
         *            {@code true} to load the last successful state, {@code false}
         *            to load the last state
-        * @return The loaded state, or {@link Optional#absent()} if the state could not be
+        * @return The loaded state, or {@link Optional#empty()} if the state could not be
         *         loaded
         */
        private Optional<State> loadLastState(String reactionName, boolean successful) {
                File stateFile = stateFile(reactionName, successful ? "success" : "last");
                try {
                        State state = objectMapper.readValue(stateFile, AbstractState.class);
-                       return fromNullable(state);
+                       return ofNullable(state);
                } catch (JsonParseException jpe1) {
                        logger.warn(String.format("State for Reaction “%s” could not be parsed.", reactionName), jpe1);
                } catch (JsonMappingException jme1) {
@@ -156,7 +170,25 @@ public class StateManager {
                } catch (IOException ioe1) {
                        logger.info(String.format("State for Reaction “%s” could not be found.", reactionName));
                }
-               return absent();
+               return empty();
+       }
+
+       public static class StateDirectory {
+
+               private final String directory;
+
+               private StateDirectory(String directory) {
+                       this.directory = directory;
+               }
+
+               public String getDirectory() {
+                       return directory;
+               }
+
+               public static StateDirectory of(String directory) {
+                       return new StateDirectory(directory);
+               }
+
        }
 
 }