X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Frhynodge%2Fstates%2FStateManager.java;h=3e08c296638782846946d4c3b1859e81c0b66e4c;hb=efb7071d0f1e2b636e70b21bbe187fb2994103f0;hp=a52e74d4bcc63a3d84dd6283e3940f8b4ef4f640;hpb=c52aa3cb7bd06a5be45bf9e771c01c1be593dc07;p=rhynodge.git diff --git a/src/main/java/net/pterodactylus/rhynodge/states/StateManager.java b/src/main/java/net/pterodactylus/rhynodge/states/StateManager.java index a52e74d..3e08c29 100644 --- a/src/main/java/net/pterodactylus/rhynodge/states/StateManager.java +++ b/src/main/java/net/pterodactylus/rhynodge/states/StateManager.java @@ -17,15 +17,15 @@ 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 net.pterodactylus.rhynodge.State; -import com.google.common.base.Optional; import org.apache.log4j.Logger; import com.fasterxml.jackson.core.JsonGenerationException; @@ -68,7 +68,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 loadLastState(String reactionName) { @@ -80,7 +80,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 loadLastSuccessfulState(String reactionName) { @@ -141,14 +141,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 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 +156,7 @@ public class StateManager { } catch (IOException ioe1) { logger.info(String.format("State for Reaction “%s” could not be found.", reactionName)); } - return absent(); + return empty(); } }