Remove Java 8 Optionals (woops\!)

oliverdunk · Mar 12, 2016 · 7fcd3e1 · 7fcd3e1
1 parent 28d3ac3
commit 7fcd3e1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/src/main/java/com/oliverdunk/jukeboxapi/commands/JukeboxCommand.java b/src/main/java/com/oliverdunk/jukeboxapi/commands/JukeboxCommand.java
@@ -18,7 +18,6 @@
 import org.bukkit.entity.Player;
 
 import java.util.HashMap;
-import java.util.Optional;
 
 @AllArgsConstructor
 public class JukeboxCommand implements CommandExecutor {
@@ -93,7 +92,7 @@ private boolean play(CommandSender sender, String[] args){
         if(playFor == null){
             HashMap<String, String> findAndReplace = new HashMap<String, String>();
             findAndReplace.put("user", args[1]);
-            MessageUtils.sendMessage(sender, "command.notOnline", Optional.of(findAndReplace));
+            MessageUtils.sendMessage(sender, "command.notOnline", findAndReplace);
             return true;
         }
         if(args[0].equalsIgnoreCase("music")) JukeboxAPI.play(playFor, args[2], ResourceType.MUSIC);
@@ -106,7 +105,7 @@ private boolean stop(CommandSender sender, String[] args){
         if(playFor == null){
             HashMap<String, String> findAndReplace = new HashMap<String, String>();
             findAndReplace.put("user", args[1]);
-            MessageUtils.sendMessage(sender, "command.notOnline", Optional.of(findAndReplace));
+            MessageUtils.sendMessage(sender, "command.notOnline", findAndReplace);
             return true;
         }
         JukeboxAPI.stopMusic(playFor);

diff --git a/src/main/java/com/oliverdunk/jukeboxapi/utils/LangUtils.java b/src/main/java/com/oliverdunk/jukeboxapi/utils/LangUtils.java
@@ -5,7 +5,6 @@
 import org.json.JSONObject;
 
 import java.io.*;
-import java.util.Optional;
 
 public class LangUtils {
 

diff --git a/src/main/java/com/oliverdunk/jukeboxapi/utils/MessageUtils.java b/src/main/java/com/oliverdunk/jukeboxapi/utils/MessageUtils.java
@@ -5,7 +5,6 @@
 import org.bukkit.command.CommandSender;
 
 import java.util.HashMap;
-import java.util.Optional;
 
 public class MessageUtils {
 
@@ -18,7 +17,7 @@ public class MessageUtils {
 	 * @param key Key which should be used to lookup the message
 	 */
 	public static void sendMessage(CommandSender player, String key){
-		sendMessage(player, key, Optional.<HashMap<String,String>>empty());
+		sendMessage(player, key, null);
 	}
 
 	/**
@@ -28,14 +27,13 @@ public static void sendMessage(CommandSender player, String key){
 	 * @param key Key which should be used to lookup the message
 	 * @param findAndReplace Optional list of keys which should be replaced with the corresponding values
 	 */
-	public static void sendMessage(CommandSender player, String key, Optional<HashMap<String, String>> findAndReplace){
+	public static void sendMessage(CommandSender player, String key, HashMap<String, String> findAndReplace){
 		String message = langUtils.get(key);
 
 		//Replace any values in the find and replace HashMap, if it is present
 		message = ChatColor.translateAlternateColorCodes('&', message);
-		if (findAndReplace.isPresent()) {
-			HashMap<String, String> findReplace = findAndReplace.get();
-			for (String find : findReplace.keySet()) message = message.replace("[" + find + "]", findReplace.get(find));
+		if (findAndReplace != null) {
+			for (String find : findAndReplace.keySet()) message = message.replace("[" + find + "]", findAndReplace.get(find));
 		}
 
 		player.sendMessage(message);