Merge remote-tracking branch 'origin/master'

Conflicts: Commons/src/main/java/org/jmangos/commons/config/Compatiple.java Commons/src/main/java/org/jmangos/commons/configuration/ConfigurableProcessor.java Commons/src/main/java/org/jmangos/commons/configuration/Property.java Commons/src/main/java/org/jmangos/commons/configuration/PropertyTransformer.java Commons/src/main/java/org/jmangos/commons/configuration/PropertyTransformerFactory.java Commons/src/main/java/org/jmangos/commons/configuration/TransformationException.java Commons/src/main/java/org/jmangos/commons/configuration/transformers/BooleanTransformer.java Commons/src/main/java/org/jmangos/commons/configuration/transformers/ByteTransformer.java Commons/src/main/java/org/jmangos/commons/configuration/transformers/CharTransformer.java Commons/src/main/java/org/jmangos/commons/configuration/transformers/ClassTransformer.java Commons/src/main/java/org/jmangos/commons/configuration/transformers/DoubleTransformer.java Commons/src/main/java/org/jmangos/commons/configuration/transformers/EnumTransformer.java Commons/src/main/java/org/jmangos/commons/configuration/transformers/FileTransformer.java Commons/src/main/java/org/jmangos/commons/configuration/transformers/FloatTransformer.java Commons/src/main/java/org/jmangos/commons/configuration/transformers/InetSocketAddressTransformer.java Commons/src/main/java/org/jmangos/commons/configuration/transformers/IntegerTransformer.java Commons/src/main/java/org/jmangos/commons/configuration/transformers/LongTransformer.java Commons/src/main/java/org/jmangos/commons/configuration/transformers/PatternTransformer.java Commons/src/main/java/org/jmangos/commons/configuration/transformers/ShortTransformer.java Commons/src/main/java/org/jmangos/commons/configuration/transformers/StringTransformer.java Commons/src/main/java/org/jmangos/commons/database/DatabaseConfig.java Commons/src/main/java/org/jmangos/commons/database/DatabaseFactory.java
JMaNGOS · Aug 11, 2012 · 68c3b75 · 68c3b75
2 parents 3788d4e + 1199d49
commit 68c3b75
Show file tree

Hide file tree

Showing 70 changed files with 2,233 additions and 2,129 deletions.
diff --git a/Auth/src/main/java/org/jmangos/auth/dao/mysql5/MySQL5BannedIpDAO.java b/Auth/src/main/java/org/jmangos/auth/dao/mysql5/MySQL5BannedIpDAO.java
@@ -69,11 +69,11 @@ public void handleInsertUpdate(
 									throws SQLException {
 								preparedStatement
 										.setString(1, bannedIP.getIp());
-								preparedStatement.setLong(2, System
-										.currentTimeMillis() / 1000);
-								preparedStatement.setLong(3, System
-										.currentTimeMillis()
-										/ 1000 + bannedIP.getTimeEnd());
+								preparedStatement.setLong(2,
+										System.currentTimeMillis() / 1000);
+								preparedStatement.setLong(3,
+										System.currentTimeMillis() / 1000
+												+ bannedIP.getTimeEnd());
 								preparedStatement.execute();
 							}
 						});
@@ -162,54 +162,50 @@ public void handleInsertUpdate(
 	public Set<BanIp> getAllBans() {
 
 		final Set<BanIp> result = new HashSet<BanIp>();
-		DB
-				.select(
-						"SELECT t1.* FROM realmd.ip_banned t1 RIGHT JOIN (select MAX(unbandate) as maxu, ip FROM realmd.ip_banned GROUP BY ip) t2 ON t1.unbandate = t2.maxu AND t1.ip = t2.ip AND t1.unbandate > UNIX_TIMESTAMP()",
-						new ReadStH() {
-							@Override
-							public void handleRead(ResultSet resultSet)
-									throws SQLException {
-								while (resultSet.next()) {
-									BanIp ip = new BanIp();
-									ip.setIp(resultSet.getString("ip"));
-									ip.setTimeEnd(resultSet
-											.getLong("unbandate"));
-									result.add(ip);
-								}
-							}
-						});
+		DB.select(
+				"SELECT t1.* FROM realmd.ip_banned t1 RIGHT JOIN (select MAX(unbandate) as maxu, ip FROM realmd.ip_banned GROUP BY ip) t2 ON t1.unbandate = t2.maxu AND t1.ip = t2.ip AND t1.unbandate > UNIX_TIMESTAMP()",
+				new ReadStH() {
+					@Override
+					public void handleRead(ResultSet resultSet)
+							throws SQLException {
+						while (resultSet.next()) {
+							BanIp ip = new BanIp();
+							ip.setIp(resultSet.getString("ip"));
+							ip.setTimeEnd(resultSet.getLong("unbandate"));
+							result.add(ip);
+						}
+					}
+				});
 		return result;
 	}
 
 	/*
 	 * (non-Javadoc)
+	 * 
 	 * @see org.wowemu.login.dao.BanIpDAO#getBan(java.lang.String)
 	 */
 	@Override
 	public BanIp getBan(final String ip) {
 		final BanIp result = new BanIp();
-		DB
-				.select(
-						" SELECT unbandate FROM ip_banned WHERE (unbandate = bandate OR unbandate > UNIX_TIMESTAMP()) AND ip = ?",
-						new ParamReadStH() {
+		DB.select(
+				" SELECT unbandate FROM ip_banned WHERE (unbandate = bandate OR unbandate > UNIX_TIMESTAMP()) AND ip = ?",
+				new ParamReadStH() {
 
-							@Override
-							public void setParams(
-									PreparedStatement preparedStatement)
-									throws SQLException {
-								preparedStatement.setString(1, ip);
-							}
+					@Override
+					public void setParams(PreparedStatement preparedStatement)
+							throws SQLException {
+						preparedStatement.setString(1, ip);
+					}
 
-							@Override
-							public void handleRead(ResultSet resultSet)
-									throws SQLException {
-								resultSet.next(); // mask is unique, only one
-													// result allowed
-								result.setIp(resultSet.getString("ip"));
-								result.setTimeEnd(resultSet
-										.getLong("unbandate"));
-							}
-						});
+					@Override
+					public void handleRead(ResultSet resultSet)
+							throws SQLException {
+						resultSet.next(); // mask is unique, only one
+											// result allowed
+						result.setIp(resultSet.getString("ip"));
+						result.setTimeEnd(resultSet.getLong("unbandate"));
+					}
+				});
 		return result;
 	}
 }
diff --git a/Auth/src/main/java/org/jmangos/auth/model/Account.java b/Auth/src/main/java/org/jmangos/auth/model/Account.java
@@ -446,7 +446,7 @@ public byte[] getvK() {
 	}
 
 	public void setvK(byte[] vK) {
-		//need clone
+		// need clone
 		this.vK = vK.clone();
 	}
 }
diff --git a/Auth/src/main/java/org/jmangos/auth/network/netty/decoder/RealmPacketFrameDecoder.java b/Auth/src/main/java/org/jmangos/auth/network/netty/decoder/RealmPacketFrameDecoder.java
@@ -31,13 +31,18 @@
  * The Class PacketFrameDecoder.
  */
 public class RealmPacketFrameDecoder extends FrameDecoder {
-	
+
 	/** The Constant log. */
 	private static final Logger log = Logger
 			.getLogger(RealmPacketFrameDecoder.class);
 
-	/* (non-Javadoc)
-	 * @see org.jboss.netty.handler.codec.frame.FrameDecoder#decode(org.jboss.netty.channel.ChannelHandlerContext, org.jboss.netty.channel.Channel, org.jboss.netty.buffer.ChannelBuffer)
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.jboss.netty.handler.codec.frame.FrameDecoder#decode(org.jboss.netty
+	 * .channel.ChannelHandlerContext, org.jboss.netty.channel.Channel,
+	 * org.jboss.netty.buffer.ChannelBuffer)
 	 */
 	@Override
 	protected Object decode(ChannelHandlerContext ctx, Channel channel,
@@ -49,23 +54,22 @@ protected Object decode(ChannelHandlerContext ctx, Channel channel,
 		message.markReaderIndex();
 		AuthToClientChannelHandler channelHandler = (AuthToClientChannelHandler) ctx
 				.getPipeline().getLast();
-		
+
 		Crypt crypt = channelHandler.getCrypt();
 		byte[] header = new byte[3];
-		
+
 		message.readBytes(header);
 		ChannelBuffer clientHeader = ChannelBuffers.wrappedBuffer(
 				ByteOrder.LITTLE_ENDIAN, header);
 		byte opcode = clientHeader.readByte();
 		int size = clientHeader.readShort();
 		if ((size < 0) || (size > 10240) || (opcode > 10240)) {
-			log
-					.error("PacketFrameDecoder::decode: realm sent malformed packet size = "
-							+ size + " , opcode = " + opcode);
-			 channel.close();
-			 return null;
+			log.error("PacketFrameDecoder::decode: realm sent malformed packet size = "
+					+ size + " , opcode = " + opcode);
+			channel.close();
+			return null;
 		}
-		
+
 		if (message.readableBytes() < size) {
 			message.resetReaderIndex();
 			return null;

diff --git a/Auth/src/main/java/org/jmangos/auth/network/netty/decoder/RealmPacketFrameEncoder.java b/Auth/src/main/java/org/jmangos/auth/network/netty/decoder/RealmPacketFrameEncoder.java
@@ -34,13 +34,18 @@
  * The Class PacketFrameEncoder.
  */
 public class RealmPacketFrameEncoder extends OneToOneEncoder {
-	
+
 	/** The Constant log. */
 	private static final Logger log = Logger
 			.getLogger(RealmPacketFrameEncoder.class);
 
-	/* (non-Javadoc)
-	 * @see org.jboss.netty.handler.codec.oneone.OneToOneEncoder#encode(org.jboss.netty.channel.ChannelHandlerContext, org.jboss.netty.channel.Channel, java.lang.Object)
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * org.jboss.netty.handler.codec.oneone.OneToOneEncoder#encode(org.jboss
+	 * .netty.channel.ChannelHandlerContext, org.jboss.netty.channel.Channel,
+	 * java.lang.Object)
 	 */
 	@Override
 	protected Object encode(ChannelHandlerContext ctx, Channel channel,
@@ -51,38 +56,44 @@ protected Object encode(ChannelHandlerContext ctx, Channel channel,
 				.getPipeline().getLast();
 		int opcode = message.readUnsignedByte();
 		int size = message.readableBytes();
-		
+
 		ChannelBuffer frame = ChannelBuffers.buffer(ByteOrder.LITTLE_ENDIAN,
 				(size + 3));
 		frame.writeByte(opcode);
 		frame.writeShort(size);
-		
+
 		byte[] tmpa = new byte[message.readableBytes()];
 		message.readBytes(tmpa);
 		frame.writeBytes(channelHandler.getCrypt().encrypt(tmpa));
-		
+
 		log.debug(String.format("[SEND PACKET] :  0x%02X", opcode));
-		List<String> d =  breakStringInChunks(new BigInteger(1,tmpa).toString(16).toUpperCase(),16);
+		List<String> d = breakStringInChunks(
+				new BigInteger(1, tmpa).toString(16).toUpperCase(), 16);
 		for (Iterator<String> iterator = d.iterator(); iterator.hasNext();) {
-			String string =  iterator.next();
+			String string = iterator.next();
 			log.debug(string);
 		}
 		return frame;
 	}
-	
+
 	/**
-	 *
-	 * @param text the text
-	 * @param chunkSize the chunk size
+	 * 
+	 * @param text
+	 *            the text
+	 * @param chunkSize
+	 *            the chunk size
 	 * @return the list
 	 */
-	private static List<String> breakStringInChunks(final String text, final int chunkSize) {
-	    final int numChunks = 0 == (text.length() % chunkSize) ? text.length() / chunkSize : 1 + (text.length() / chunkSize);
-	    final List<String> chunks = new ArrayList<String>(numChunks);
-	    for (int startIndex = 0; startIndex < text.length(); startIndex += chunkSize) {
-	        final int endIndex = Math.min(text.length(), startIndex + chunkSize);
-	        chunks.add(text.substring(startIndex, endIndex));
-	    }
-	    return chunks;
+	private static List<String> breakStringInChunks(final String text,
+			final int chunkSize) {
+		final int numChunks = 0 == (text.length() % chunkSize) ? text.length()
+				/ chunkSize : 1 + (text.length() / chunkSize);
+		final List<String> chunks = new ArrayList<String>(numChunks);
+		for (int startIndex = 0; startIndex < text.length(); startIndex += chunkSize) {
+			final int endIndex = Math
+					.min(text.length(), startIndex + chunkSize);
+			chunks.add(text.substring(startIndex, endIndex));
+		}
+		return chunks;
 	}
 }
diff --git a/Auth/src/main/java/org/jmangos/auth/network/netty/handler/AuthToClientChannelHandler.java b/Auth/src/main/java/org/jmangos/auth/network/netty/handler/AuthToClientChannelHandler.java
@@ -60,6 +60,7 @@ public class AuthToClientChannelHandler extends SimpleChannelUpstreamHandler {
 			.getLogger(AuthToClientChannelHandler.class);
 
 	private Crypt crypt = new Crypt();
+
 	/**
 	 * Instantiates a new Auth to Client channel handler.
 	 * 

diff --git a/Auth/src/main/java/org/jmangos/auth/network/netty/packet/client/CMD_REALM_LIST.java b/Auth/src/main/java/org/jmangos/auth/network/netty/packet/client/CMD_REALM_LIST.java
@@ -39,7 +39,8 @@ public class CMD_REALM_LIST extends AbstractWoWClientPacket {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see org.jmangos.commons.network.model.ReceivablePacket#getMinimumLength()
+	 * @see
+	 * org.jmangos.commons.network.model.ReceivablePacket#getMinimumLength()
 	 */
 	@Override
 	public int getMinimumLength() {

diff --git a/Auth/src/main/java/org/jmangos/auth/network/netty/packet/client/CMD_TEST_CRYPT.java b/Auth/src/main/java/org/jmangos/auth/network/netty/packet/client/CMD_TEST_CRYPT.java
@@ -30,12 +30,11 @@
 public class CMD_TEST_CRYPT extends AbstractWoWClientPacket {
 
 	/** The logger. */
-	private static Logger logger = Logger
-			.getLogger(CMD_TEST_CRYPT.class);
+	private static Logger logger = Logger.getLogger(CMD_TEST_CRYPT.class);
 	/** The sender. */
 	@Inject
 	private AbstractPacketSender sender;
-	
+
 	public CMD_TEST_CRYPT() {
 		super();
 	}
@@ -47,11 +46,11 @@ public CMD_TEST_CRYPT() {
 	 */
 	@Override
 	protected void readImpl() throws BufferUnderflowException, RuntimeException {
-		logger.debug( (char)readC());
-		logger.debug( (char)readC());
-		logger.debug( (char)readC());
-		logger.debug( (char)readC());
-		logger.debug( (char)readC());
+		logger.debug((char) readC());
+		logger.debug((char) readC());
+		logger.debug((char) readC());
+		logger.debug((char) readC());
+		logger.debug((char) readC());
 	}
 
 	/*

diff --git a/Auth/src/main/java/org/jmangos/auth/network/netty/packet/server/TCMD_AUTH_ENABLE_CRYPT.java b/Auth/src/main/java/org/jmangos/auth/network/netty/packet/server/TCMD_AUTH_ENABLE_CRYPT.java
@@ -26,7 +26,8 @@ public class TCMD_AUTH_ENABLE_CRYPT extends AbstractWoWServerPacket {
 
 	/** The Constant log. */
 	@SuppressWarnings("unused")
-	private static final Logger log = Logger.getLogger(TCMD_AUTH_ENABLE_CRYPT.class);
+	private static final Logger log = Logger
+			.getLogger(TCMD_AUTH_ENABLE_CRYPT.class);
 
 	/**
 	 * Instantiates a new <tt>TCMD_AUTH_ENABLE_CRYPT</tt>.
@@ -41,6 +42,6 @@ public TCMD_AUTH_ENABLE_CRYPT() {
 	 */
 	@Override
 	protected void writeImpl() {
-		
+
 	}
 }
diff --git a/Commons/src/main/java/org/jmangos/commons/database/CallReadStH.java b/Commons/src/main/java/org/jmangos/commons/database/CallReadStH.java
@@ -19,19 +19,19 @@
 import java.sql.CallableStatement;
 import java.sql.SQLException;
 
-
 /**
  * The Interface CallReadStH.
- *
+ * 
  */
-public interface CallReadStH extends ReadStH
-{
-
+public interface CallReadStH extends ReadStH {
+
 	/**
 	 * Sets the params.
-	 *
-	 * @param stmt the new params
-	 * @throws SQLException the sQL exception
+	 * 
+	 * @param stmt
+	 *            the new params
+	 * @throws SQLException
+	 *             the sQL exception
 	 */
 	public void setParams(CallableStatement stmt) throws SQLException;
 }