BETA: GlobalVariablesManager rework.

	* Extending already existing AbstractVariables
	* Adding a hasVariables method.
	* Reviewed by: UnAfraid, Nos

L2J_Server_BETA/java/com/l2jserver/gameserver/Shutdown.java

@@ -552,7 +552,7 @@ public class Shutdown extends Thread
 		_log.info("Quest Manager: Data saved(" + tc.getEstimatedTimeAndRestartCounter() + "ms).");
 		
 		// Save all global variables data
-		GlobalVariablesManager.getInstance().saveVars();
+		GlobalVariablesManager.getInstance().store();
 		_log.info("Global Variables Manager: Variables saved(" + tc.getEstimatedTimeAndRestartCounter() + "ms).");
 		
 		// Save items on ground before closing

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/GlobalVariablesManager.java

@@ -21,87 +21,102 @@ package com.l2jserver.gameserver.instancemanager;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import java.sql.Statement;
-import java.util.Map;
+import java.sql.SQLException;
+import java.util.Map.Entry;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import com.l2jserver.L2DatabaseFactory;
-import com.l2jserver.util.L2FastMap;
+import com.l2jserver.gameserver.model.variables.AbstractVariables;
 
 /**
- * @author Gigiikun
+ * Global Variables Manager.
+ * @author xban1x
  */
-public class GlobalVariablesManager
+public final class GlobalVariablesManager extends AbstractVariables
 {
 	private static final Logger _log = Logger.getLogger(GlobalVariablesManager.class.getName());
 	
-	private static final String LOAD_VAR = "SELECT var,value FROM global_variables";
-	private static final String SAVE_VAR = "INSERT INTO global_variables (var,value) VALUES (?,?) ON DUPLICATE KEY UPDATE value=?";
-	
-	private final Map<String, String> _variablesMap = new L2FastMap<>(true);
+	// SQL Queries.
+	private static final String SELECT_QUERY = "SELECT * FROM global_variables";
+	private static final String DELETE_QUERY = "DELETE FROM global_variables";
+	private static final String INSERT_QUERY = "INSERT INTO global_variables (var, val) VALUES (?, ?)";
 	
 	protected GlobalVariablesManager()
 	{
-		loadVars();
+		load();
 	}
 	
-	private final void loadVars()
+	@Override
+	protected void load()
 	{
+		// Restore previous variables.
 		try (Connection con = L2DatabaseFactory.getInstance().getConnection();
-			Statement statement = con.createStatement();
-			ResultSet rset = statement.executeQuery(LOAD_VAR))
+			PreparedStatement st = con.prepareStatement(SELECT_QUERY))
 		{
-			String var, value;
-			while (rset.next())
+			try (ResultSet rset = st.executeQuery())
 			{
-				var = rset.getString(1);
-				value = rset.getString(2);
-				
-				_variablesMap.put(var, value);
+				while (rset.next())
+				{
+					set(rset.getString("var"), rset.getString("value"));
+				}
 			}
 		}
-		catch (Exception e)
+		catch (SQLException e)
+		{
+			_log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't restore global variables");
+		}
+		finally
 		{
-			_log.warning(getClass().getSimpleName() + ": problem while loading variables: " + e);
+			compareAndSetChanges(true, false);
 		}
+		_log.log(Level.INFO, getClass().getSimpleName() + ": Loaded " + getSet().size() + " variables.");
 	}
 	
-	public final void saveVars()
+	@Override
+	public void store()
 	{
+		// No changes, nothing to store.
+		if (!hasChanges())
+		{
+			return;
+		}
 		
-		try (Connection con = L2DatabaseFactory.getInstance().getConnection();
-			PreparedStatement statement = con.prepareStatement(SAVE_VAR))
+		try (Connection con = L2DatabaseFactory.getInstance().getConnection())
 		{
-			for (String var : _variablesMap.keySet())
+			// Clear previous entries.
+			try (PreparedStatement st = con.prepareStatement(DELETE_QUERY))
+			{
+				st.execute();
+			}
+			
+			// Insert all variables.
+			try (PreparedStatement st = con.prepareStatement(INSERT_QUERY))
 			{
-				statement.setString(1, var);
-				statement.setString(2, _variablesMap.get(var));
-				statement.setString(3, _variablesMap.get(var));
-				statement.execute();
-				statement.clearParameters();
+				for (Entry<String, Object> entry : getSet().entrySet())
+				{
+					st.setString(1, entry.getKey());
+					st.setString(2, String.valueOf(entry.getValue()));
+					st.addBatch();
+				}
+				st.executeBatch();
 			}
 		}
-		catch (Exception e)
+		catch (SQLException e)
 		{
-			_log.warning(getClass().getSimpleName() + ": problem while saving variables: " + e);
+			_log.log(Level.WARNING, getClass().getSimpleName() + ": Couldn't save global variables to database.", e);
 		}
+		finally
+		{
+			compareAndSetChanges(true, false);
+		}
+		_log.log(Level.INFO, getClass().getSimpleName() + ": Stored " + getSet().size() + " variables.");
 	}
 	
-	public void storeVariable(String var, String value)
-	{
-		_variablesMap.put(var, value);
-	}
-	
-	public boolean isVariableStored(String var)
-	{
-		return _variablesMap.containsKey(var);
-	}
-	
-	public String getStoredVariable(String var)
-	{
-		return _variablesMap.get(var);
-	}
-	
+	/**
+	 * Gets the single instance of {@code GlobalVariablesManager}.
+	 * @return single instance of {@code GlobalVariablesManager}
+	 */
 	public static final GlobalVariablesManager getInstance()
 	{
 		return SingletonHolder._instance;

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/GraciaSeedsManager.java

@@ -53,9 +53,9 @@ public class GraciaSeedsManager
 		{
 			case SODTYPE:
 				// Seed of Destruction
-				GlobalVariablesManager.getInstance().storeVariable("SoDState", String.valueOf(_SoDState));
-				GlobalVariablesManager.getInstance().storeVariable("SoDTiatKilled", String.valueOf(_SoDTiatKilled));
-				GlobalVariablesManager.getInstance().storeVariable("SoDLSCDate", String.valueOf(_SoDLastStateChangeDate.getTimeInMillis()));
+				GlobalVariablesManager.getInstance().set("SoDState", _SoDState);
+				GlobalVariablesManager.getInstance().set("SoDTiatKilled", _SoDTiatKilled);
+				GlobalVariablesManager.getInstance().set("SoDLSCDate", _SoDLastStateChangeDate.getTimeInMillis());
 				break;
 			case SOITYPE:
 				// Seed of Infinity
@@ -72,11 +72,11 @@ public class GraciaSeedsManager
 	public void loadData()
 	{
 		// Seed of Destruction variables
-		if (GlobalVariablesManager.getInstance().isVariableStored("SoDState"))
+		if (GlobalVariablesManager.getInstance().hasVariable("SoDState"))
 		{
-			_SoDState = Integer.parseInt(GlobalVariablesManager.getInstance().getStoredVariable("SoDState"));
-			_SoDTiatKilled = Integer.parseInt(GlobalVariablesManager.getInstance().getStoredVariable("SoDTiatKilled"));
-			_SoDLastStateChangeDate.setTimeInMillis(Long.parseLong(GlobalVariablesManager.getInstance().getStoredVariable("SoDLSCDate")));
+			_SoDState = GlobalVariablesManager.getInstance().getInteger("SoDState");
+			_SoDTiatKilled = GlobalVariablesManager.getInstance().getInteger("SoDTiatKilled");
+			_SoDLastStateChangeDate.setTimeInMillis(GlobalVariablesManager.getInstance().getLong("SoDLSCDate"));
 		}
 		else
 		{

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/HellboundManager.java

@@ -238,10 +238,10 @@ public class HellboundManager
 	
 	private final void loadData()
 	{
-		if (GlobalVariablesManager.getInstance().isVariableStored("HBLevel"))
+		if (GlobalVariablesManager.getInstance().hasVariable("HBLevel"))
 		{
-			_level = Integer.parseInt(GlobalVariablesManager.getInstance().getStoredVariable("HBLevel"));
-			_trust = Integer.parseInt(GlobalVariablesManager.getInstance().getStoredVariable("HBTrust"));
+			_level = GlobalVariablesManager.getInstance().getInteger("HBLevel");
+			_trust = GlobalVariablesManager.getInstance().getInteger("HBTrust");
 		}
 		else
 		{
@@ -251,8 +251,8 @@ public class HellboundManager
 	
 	public final void saveData()
 	{
-		GlobalVariablesManager.getInstance().storeVariable("HBLevel", String.valueOf(_level));
-		GlobalVariablesManager.getInstance().storeVariable("HBTrust", String.valueOf(_trust));
+		GlobalVariablesManager.getInstance().set("HBLevel", _level);
+		GlobalVariablesManager.getInstance().set("HBTrust", _trust);
 	}
 	
 	private final void loadSpawns()

L2J_Server_BETA/java/com/l2jserver/gameserver/model/variables/AbstractVariables.java

@@ -79,6 +79,16 @@ public abstract class AbstractVariables extends StatsSet
 		super.set(name, value);
 	}
 	
+	/**
+	 * Return true if there exists a record for the variable name.
+	 * @param name
+	 * @return
+	 */
+	public boolean hasVariable(String name)
+	{
+		return getSet().keySet().contains(name);
+	}
+	
 	/**
 	 * @return {@code true} if changes are made since last load/save.
 	 */

L2J_Server_BETA/java/com/l2jserver/gameserver/taskmanager/tasks/TaskGlobalVariablesSave.java

@@ -40,7 +40,7 @@ public class TaskGlobalVariablesSave extends Task
 	@Override
 	public void onTimeElapsed(ExecutedTask task)
 	{
-		GlobalVariablesManager.getInstance().saveVars();
+		GlobalVariablesManager.getInstance().store();
 	}
 	
 	@Override