BETA: Id Factory cleanup and format.

L2J_Server_BETA/java/com/l2jserver/gameserver/idfactory/BitSetIDFactory.java

@@ -16,21 +16,16 @@ package com.l2jserver.gameserver.idfactory;
 
 import java.util.BitSet;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import com.l2jserver.gameserver.ThreadPoolManager;
 import com.l2jserver.util.PrimeFinder;
 
 /**
  * This class ..
- *
  * @version $Revision: 1.2 $ $Date: 2004/06/27 08:12:59 $
  */
 public class BitSetIDFactory extends IdFactory
 {
-	private static Logger _log = Logger.getLogger(BitSetIDFactory.class.getName());
-	
 	private BitSet _freeIds;
 	private AtomicInteger _freeIdCount;
 	private AtomicInteger _nextFreeId;
@@ -43,7 +38,9 @@ public class BitSetIDFactory extends IdFactory
 			synchronized (BitSetIDFactory.this)
 			{
 				if (reachingBitSetCapacity())
+				{
 					increaseBitSetCapacity();
+				}
 			}
 		}
 		
@@ -53,12 +50,12 @@ public class BitSetIDFactory extends IdFactory
 	{
 		super();
 		
-		synchronized(BitSetIDFactory.class)
+		synchronized (BitSetIDFactory.class)
 		{
 			ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new BitSetCapacityCheck(), 30000, 30000);
 			initialize();
 		}
-		_log.info("IDFactory: " + _freeIds.size() + " id's available.");
+		_log.info(getClass().getSimpleName() + ": " + _freeIds.size() + " id's available.");
 	}
 	
 	public void initialize()
@@ -74,7 +71,7 @@ public class BitSetIDFactory extends IdFactory
 				int objectID = usedObjectId - FIRST_OID;
 				if (objectID < 0)
 				{
-					_log.warning("Object ID " + usedObjectId + " in DB is less than minimum ID of " + FIRST_OID);
+					_log.warning(getClass().getSimpleName() + ": Object ID " + usedObjectId + " in DB is less than minimum ID of " + FIRST_OID);
 					continue;
 				}
 				_freeIds.set(usedObjectId - FIRST_OID);
@@ -87,14 +84,10 @@ public class BitSetIDFactory extends IdFactory
 		catch (Exception e)
 		{
 			_initialized = false;
-			_log.log(Level.SEVERE, "BitSet ID Factory could not be initialized correctly: " + e.getMessage(), e);
+			_log.severe(getClass().getSimpleName() + ": Could not be initialized properly: " + e.getMessage());
 		}
 	}
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.idfactory.IdFactory#releaseId(int)
-	 */
 	@Override
 	public synchronized void releaseId(int objectID)
 	{
@@ -104,13 +97,11 @@ public class BitSetIDFactory extends IdFactory
 			_freeIdCount.incrementAndGet();
 		}
 		else
-			_log.warning("BitSet ID Factory: release objectID " + objectID + " failed (< " + FIRST_OID + ")");
+		{
+			_log.warning(getClass().getSimpleName() + ": Release objectID " + objectID + " failed (< " + FIRST_OID + ")");
+		}
 	}
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.idfactory.IdFactory#getNextId()
-	 */
 	@Override
 	public synchronized int getNextId()
 	{
@@ -141,10 +132,6 @@ public class BitSetIDFactory extends IdFactory
 		return newID + FIRST_OID;
 	}
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.idfactory.IdFactory#size()
-	 */
 	@Override
 	public synchronized int size()
 	{
@@ -152,7 +139,6 @@ public class BitSetIDFactory extends IdFactory
 	}
 	
 	/**
-	 * 
 	 * @return
 	 */
 	protected synchronized int usedIdCount()
@@ -161,17 +147,16 @@ public class BitSetIDFactory extends IdFactory
 	}
 	
 	/**
-	 * 
 	 * @return
 	 */
 	protected synchronized boolean reachingBitSetCapacity()
 	{
-		return PrimeFinder.nextPrime(usedIdCount() * 11 / 10) > _freeIds.size();
+		return PrimeFinder.nextPrime((usedIdCount() * 11) / 10) > _freeIds.size();
 	}
 	
 	protected synchronized void increaseBitSetCapacity()
 	{
-		BitSet newBitSet = new BitSet(PrimeFinder.nextPrime(usedIdCount() * 11 / 10));
+		BitSet newBitSet = new BitSet(PrimeFinder.nextPrime((usedIdCount() * 11) / 10));
 		newBitSet.or(_freeIds);
 		_freeIds = newBitSet;
 	}

L2J_Server_BETA/java/com/l2jserver/gameserver/idfactory/CompactionIDFactory.java

@@ -18,25 +18,18 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import com.l2jserver.Config;
 import com.l2jserver.L2DatabaseFactory;
 
-
 /**
- * This class ...
- * 18.8.2010 - JIV - Disabling until someone update it
- *
- * @version $Revision: 1.2 $ $Date: 2004/06/27 08:12:59 $
+ * 18.8.2010 - JIV: Disabling until someone update it
  */
 @Deprecated
 public class CompactionIDFactory extends IdFactory
 {
-	private static Logger _log = Logger.getLogger(CompactionIDFactory.class.getName());
 	private int _curOID;
-	private int _freeSize;
+	private final int _freeSize;
 	
 	protected CompactionIDFactory()
 	{
@@ -48,7 +41,7 @@ public class CompactionIDFactory extends IdFactory
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
-			//con.createStatement().execute("drop table if exists tmp_obj_id");
+			// con.createStatement().execute("drop table if exists tmp_obj_id");
 			
 			int[] tmp_obj_ids = extractUsedObjectIDTable();
 			
@@ -58,12 +51,12 @@ public class CompactionIDFactory extends IdFactory
 				N = insertUntil(tmp_obj_ids, idx, N, con);
 			}
 			_curOID++;
-			_log.info("IdFactory: Next usable Object ID is: " + _curOID);
+			_log.info(getClass().getSimpleName() + ": Next usable Object ID is: " + _curOID);
 			_initialized = true;
 		}
 		catch (Exception e)
 		{
-			_log.log(Level.SEVERE, "ID Factory could not be initialized correctly: " + e.getMessage(), e);
+			_log.severe(getClass().getSimpleName() + ": Could not initialize properly: " + e.getMessage());
 		}
 		finally
 		{
@@ -91,7 +84,7 @@ public class CompactionIDFactory extends IdFactory
 				while (rs.next())
 				{
 					int badId = rs.getInt(1);
-					_log.severe("Bad ID " + badId + " in DB found by: " + check);
+					_log.severe(getClass().getSimpleName() + ": Bad ID " + badId + " in DB found by: " + check);
 					throw new RuntimeException();
 				}
 				rs.close();
@@ -100,12 +93,14 @@ public class CompactionIDFactory extends IdFactory
 		}
 		
 		int hole = id - _curOID;
-		if (hole > N - idx)
+		if (hole > (N - idx))
+		{
 			hole = N - idx;
+		}
 		for (int i = 1; i <= hole; i++)
 		{
 			id = tmp_obj_ids[N - i];
-			_log.info("Compacting DB object ID=" + id + " into " + (_curOID));
+			_log.info(getClass().getSimpleName() + ": Compacting DB object ID=" + id + " into " + (_curOID));
 			for (String update : ID_UPDATES)
 			{
 				PreparedStatement ps = con.prepareStatement(update);
@@ -116,35 +111,48 @@ public class CompactionIDFactory extends IdFactory
 			}
 			_curOID++;
 		}
-		if (hole < N - idx)
+		if (hole < (N - idx))
+		{
 			_curOID++;
+		}
 		return N - hole;
 	}
 	
 	@Override
 	public synchronized int getNextId()
 	{
-		/*if (_freeSize == 0)*/return _curOID++;
-		/* else
-		 	return _freeOIDs[--_freeSize];*/
+		// @formatter:off
+		/*
+		 * if (_freeSize == 0)
+		 */
+			return _curOID++;
+		/*
+		 * else
+		 * 	return _freeOIDs[--_freeSize];
+		 */
+		// @formatter:on
 	}
 	
 	@Override
 	public synchronized void releaseId(int id)
 	{
-		//dont release ids until we are sure it isnt messing up
-		/* if (_freeSize >= _freeOIDs.length)
+		// Don't release Ids until we are sure it isn't messing up
+		// @formatter:off
+		/*
+		 if (_freeSize >= _freeOIDs.length)
 		 {
-		     int[] tmp = new int[_freeSize + STACK_SIZE_INCREMENT];
-		     System.arraycopy(_freeOIDs, 0, tmp, 0, _freeSize);
-		     _freeOIDs = tmp;
+		 	int[] tmp = new int[_freeSize + STACK_SIZE_INCREMENT];
+		 	System.arraycopy(_freeOIDs, 0, tmp, 0, _freeSize);
+		 	_freeOIDs = tmp;
 		 }
-		 _freeOIDs[_freeSize++] = id;*/
+		 _freeOIDs[_freeSize++] = id;
+		 */
+		// @formatter:on
 	}
 	
 	@Override
 	public int size()
 	{
-		return _freeSize + LAST_OID - FIRST_OID;
+		return (_freeSize + LAST_OID) - FIRST_OID;
 	}
 }

L2J_Server_BETA/java/com/l2jserver/gameserver/idfactory/IdFactory.java

@@ -33,7 +33,7 @@ import com.l2jserver.L2DatabaseFactory;
  */
 public abstract class IdFactory
 {
-	private static Logger _log = Logger.getLogger(IdFactory.class.getName());
+	protected final Logger _log = Logger.getLogger(getClass().getName());
 	
 	@Deprecated
 	protected static final String[] ID_UPDATES =

L2J_Server_BETA/java/com/l2jserver/gameserver/idfactory/StackIDFactory.java

@@ -19,25 +19,20 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Stack;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import com.l2jserver.Config;
 import com.l2jserver.L2DatabaseFactory;
 
 /**
  * This class ...
- *
  * @version $Revision: 1.3.2.1.2.7 $ $Date: 2005/04/11 10:06:12 $
  */
 public class StackIDFactory extends IdFactory
 {
-	private static Logger _log = Logger.getLogger(StackIDFactory.class.getName());
-	
 	private int _curOID;
 	private int _tempOID;
 	
-	private Stack<Integer> _freeOIDStack = new Stack<Integer>();
+	private final Stack<Integer> _freeOIDStack = new Stack<>();
 	
 	protected StackIDFactory()
 	{
@@ -49,7 +44,7 @@ public class StackIDFactory extends IdFactory
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
-			//con.createStatement().execute("drop table if exists tmp_obj_id");
+			// con.createStatement().execute("drop table if exists tmp_obj_id");
 			
 			int[] tmp_obj_ids = extractUsedObjectIDTable();
 			if (tmp_obj_ids.length > 0)
@@ -70,7 +65,7 @@ public class StackIDFactory extends IdFactory
 		}
 		catch (Exception e)
 		{
-			_log.log(Level.SEVERE, "ID Factory could not be initialized correctly:" + e.getMessage(), e);
+			_log.severe(getClass().getSimpleName() + ": Could not be initialized properly:" + e.getMessage());
 		}
 		finally
 		{
@@ -93,7 +88,7 @@ public class StackIDFactory extends IdFactory
 			{
 				PreparedStatement ps = con.prepareStatement(check);
 				ps.setInt(1, _tempOID);
-				//ps.setInt(1, _curOID);
+				// ps.setInt(1, _curOID);
 				ps.setInt(2, id);
 				ResultSet rs = ps.executeQuery();
 				while (rs.next())
@@ -107,19 +102,23 @@ public class StackIDFactory extends IdFactory
 			}
 		}
 		
-		//int hole = id - _curOID;
+		// int hole = id - _curOID;
 		int hole = id - _tempOID;
-		if (hole > N - idx)
+		if (hole > (N - idx))
+		{
 			hole = N - idx;
+		}
 		for (int i = 1; i <= hole; i++)
 		{
-			//log.info("Free ID added " + (_tempOID));
+			// log.info("Free ID added " + (_tempOID));
 			_freeOIDStack.push(_tempOID);
 			_tempOID++;
-			//_curOID++;
+			// _curOID++;
 		}
-		if (hole < N - idx)
+		if (hole < (N - idx))
+		{
 			_tempOID++;
+		}
 		return N - hole;
 	}
 	
@@ -133,7 +132,9 @@ public class StackIDFactory extends IdFactory
 	{
 		int id;
 		if (!_freeOIDStack.empty())
+		{
 			id = _freeOIDStack.pop();
+		}
 		else
 		{
 			id = _curOID;
@@ -155,6 +156,6 @@ public class StackIDFactory extends IdFactory
 	@Override
 	public int size()
 	{
-		return FREE_OBJECT_ID_SIZE - _curOID + FIRST_OID + _freeOIDStack.size();
+		return (FREE_OBJECT_ID_SIZE - _curOID) + FIRST_OID + _freeOIDStack.size();
 	}
 }