Fixed some warning and small issues

Change-Id: I132e3bcb46328e26b36f66a63246212565d33cae

Author: jacek-marchwicki

AndroidSocketIO/build.gradle

@@ -26,7 +26,7 @@ dependencies {
     compile "javax.inject:javax.inject:1"
 }
 
-def baseVersionName = "1.1"
+def baseVersionName = "1.1.1"
 if (project.hasProperty("versionSuffix")) {
     project.ext.versionSuffix = project.versionSuffix
 } else {

AndroidSocketIO/src/com/appunite/socketio/IOMessage.java

@@ -17,6 +17,7 @@
 package com.appunite.socketio;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 
 import com.google.common.base.Optional;
@@ -55,20 +56,20 @@ public IOMessage(int messageType, String messageId) {
 	}
 
 	public IOMessage(int messageType, String messageId, String messageEndpoint) {
-		checkArgument(MSG_DISCONNECT >= 0 && messageType <= MSG_NOP, "Unknown message type");
-		checkArgument(messageId != null, "message could not be null");
-		checkArgument(messageEndpoint != null, "message endpoint could not be null");
+		checkArgument((messageType >= MSG_DISCONNECT) && (messageType <= MSG_NOP), "Unknown message type");
+		checkNotNull(messageId, "message could not be null");
+        checkNotNull(messageEndpoint, "message endpoint could not be null");
 		this.mMessageType = messageType;
 		this.mMessageId = messageId;
 		this.mMessageEndpoint = messageEndpoint;
 		this.mMessageData = Optional.absent();
 	}
 
 	public IOMessage(int messageType, String messageId, String messageEndpoint, String messageData) {
-		checkArgument(MSG_DISCONNECT >= 0 && messageType <= MSG_NOP, "Unknown message type");
-		checkArgument(messageId != null, "message could not be null");
-		checkArgument(messageEndpoint != null, "message endpoint could not be null");
-		checkArgument(messageData != null, "messag could not be null");
+		checkArgument(messageType >= MSG_DISCONNECT && messageType <= MSG_NOP, "Unknown message type");
+        checkNotNull(messageId, "message could not be null");
+        checkNotNull(messageEndpoint, "message endpoint could not be null");
+        checkNotNull(messageData, "messag could not be null");
 		this.mMessageType = messageType;
 		this.mMessageId = messageId;
 		this.mMessageEndpoint = messageEndpoint;
@@ -77,22 +78,15 @@ public IOMessage(int messageType, String messageId, String messageEndpoint, Stri
 
 	@Override
 	public String toString() {
-		return new StringBuilder().append("Type: ").append(mMessageType)
-				.append(", Id: ").append(mMessageId).append(", Endpoint: ")
-				.append(mMessageEndpoint).append(", Data: ")
-				.append(mMessageData).toString();
+		return "Type: " + mMessageType + ", Id: " + mMessageId + ", Endpoint: " + mMessageEndpoint + ", Data: " + mMessageData;
 	}
 
 	public String getMessage() {
-		return new StringBuilder().append(mMessageType).append(':')
-				.append(mMessageId)
-				.append(':').append(mMessageEndpoint).append(':')
-				.append(mMessageData.isPresent() ? mMessageData.get() : "")
-				.toString();
+		return String.valueOf(mMessageType) + ':' + mMessageId + ':' + mMessageEndpoint + ':' + (mMessageData.isPresent() ? mMessageData.get() : "");
 	}
 
 	public static IOMessage parse(String message) throws WrongSocketIOResponse {
-		checkArgument(message != null, "Message should not be null");
+		checkNotNull(message, "Message should not be null");
 		int messageTypeEnd = message.indexOf(':');
 		if (messageTypeEnd < 1) {
 			throw new WrongSocketIOResponse("Wrong response from socket io");

AndroidSocketIO/src/com/appunite/socketio/SocketBase.java

@@ -26,6 +26,9 @@
 
 import com.appunite.socketio.helpers.HTTPUtils.WrongHttpResponseCode;
 import com.appunite.websocket.WrongWebsocketResponse;
+
+import javax.annotation.Nonnull;
+
 import static com.google.common.base.Preconditions.*;
 
 /**
@@ -50,18 +53,18 @@ public SocketHandler(SocketBase socketBase) {
 		}
 
 		@Override
-		public void dispatchMessage(Message msg) {
+		public void dispatchMessage(@Nonnull Message msg) {
 			mSocketBase.handlerMessage(msg);
 		}
 
 	}
 
-	private Object mStartStopLock = new Object();
+	private final Object mStartStopLock = new Object();
 	private Thread mThread = null;
 
 	protected final SocketListener mListener;
 
-	protected Object mInterruptionLock = new Object();
+	protected final Object mInterruptionLock = new Object();
 	protected boolean mInterrupted = true;
 
 	private SocketHandler mHandler;
@@ -75,7 +78,7 @@ public SocketBase(SocketListener listener) {
 	/**
 	 * Receive message on connect method thread
 	 * 
-	 * @param msg
+	 * @param msg message
 	 */
 	public abstract void handlerMessage(Message msg);
 
@@ -85,7 +88,7 @@ public SocketBase(SocketListener listener) {
 	public void connect() {
 		synchronized (mStartStopLock) {
 			checkState(mThread == null, "You are already connected/connecting");
-			assert (mInterrupted == true);
+			checkState(mInterrupted);
 			mInterrupted = false;
 			mHandler = new SocketHandler(this);
 			mThread = new Thread(this);
@@ -112,7 +115,8 @@ public boolean isAlive() {
 	 * 
 	 * (Thread safe)
 	 */
-	public void disconnectAsyncIfAlive() {
+	@SuppressWarnings("UnusedDeclaration")
+    public void disconnectAsyncIfAlive() {
 		new Thread(new Runnable() {
 
 			@Override
@@ -139,7 +143,7 @@ public boolean disconnectIfAlive() {
 				throw new RuntimeException(
 						"disconnectIfAlive could not be called from socket thread");
 			}
-			assert (mInterrupted == false);
+			checkState(!mInterrupted);
 			synchronized (mInterruptionLock) {
 				mInterrupted = true;
 				interrupt();
@@ -149,7 +153,7 @@ public boolean disconnectIfAlive() {
 					mThread.join();
 					// Loop until success
 					break;
-				} catch (InterruptedException e) {
+				} catch (InterruptedException ignore) {
 				}
 			}
 			mHandler.removeCallbacksAndMessages(null);
@@ -166,7 +170,7 @@ public void run() {
 			synchronized (mInterruptionLock) {
 				boolean reconnect = mListener.onDisconnected(mInterrupted);
 				if (mInterrupted) {
-					checkState(reconnect == false,
+					checkState(!reconnect,
 							"If disconnection is forced by user reconnect value should be always false");
 				}
 				if (!reconnect)

AndroidSocketIO/src/com/appunite/socketio/SocketIO.java

@@ -99,7 +99,8 @@ public void registerToEndpoint(String endpoint) throws IOException,
 		sendMessage(new IOMessage(IOMessage.MSG_CONNECT, "", endpoint));
 	}
 
-	@Override
+	@SuppressWarnings("StatementWithEmptyBody")
+    @Override
 	public void onStringMessage(String message) throws IOException,
 			InterruptedException, NotConnectedException {
 		try {
@@ -108,7 +109,7 @@ public void onStringMessage(String message) throws IOException,
 			}
 			IOMessage msg = IOMessage.parse(message);
 			redelayKill();
-			if (msg.mMessageType == IOMessage.MSG_DISCONNECT) {
+            if (msg.mMessageType == IOMessage.MSG_DISCONNECT) {
 				// TODO Im not quite sure what we have to do if we will receive
 				// message like this - maybe we will implement this later
 			} else if (msg.mMessageType == IOMessage.MSG_CONNECT) {
@@ -250,8 +251,8 @@ public void sendStringMessage(String messageEndpoint, String message) throws IOE
 	@Override
 	public void sendJsonMessage(String messageEndpoint, JSONObject object) throws IOException,
 			InterruptedException, NotConnectedException {
-		checkArgument(object != null, "Object could not be null");
-		checkArgument(messageEndpoint != null, "Message endpoint could not be null");
+		checkNotNull(object, "Object could not be null");
+        checkNotNull(messageEndpoint, "Message endpoint could not be null");
 		IOMessage msg = new IOMessage(IOMessage.MSG_MESSAGE, "", messageEndpoint,
 				object.toString());
 		sendMessage(msg);
@@ -263,9 +264,9 @@ public void sendJsonMessage(String messageEndpoint, JSONObject object) throws IO
 	@Override
 	public void sendJsonEvent(String messageEndpoint, String name, JSONArray args) throws IOException,
 			InterruptedException, NotConnectedException {
-		checkArgument(messageEndpoint != null, "Message endpoint could not be null");
-		checkArgument(args != null, "Args could not be null");
-		checkArgument(name != null, "Name could not be null");
+        checkNotNull(messageEndpoint, "Message endpoint could not be null");
+        checkNotNull(args, "Args could not be null");
+        checkNotNull(name, "Name could not be null");
 		checkArgument(!DISALLOWED_NAMES.contains(name),
 				"Name could not be one of the reserved values: "
 						+ DISALLOWED_NAMES.toString());

AndroidSocketIO/src/com/appunite/socketio/SocketIOBase.java

@@ -38,7 +38,7 @@
 import com.google.common.collect.ImmutableSet;
 
 /**
- * Base class for {@link SocketIO}. Its ask socketio server for websocket
+ * Base class for {@link SocketIO}. Its ask socketIO server for websocket
  * connection.
  * 
  * @author Jacek Marchwicki <jacek.marchwicki@gmail.com>

AndroidSocketIO/src/com/appunite/socketio/SocketListener.java

@@ -35,7 +35,7 @@ public interface SocketListener {
 	/**
 	 * Occurs when connection was established. Called on Socket thread
 	 * 
-	 * @param socketWriter
+	 * @param socketWriter socket writer
 	 * @throws IOException
 	 *             can be thrown when socket exception occur
 	 * @throws InterruptedException
@@ -100,7 +100,7 @@ public void onReceivedEvent(String name, JSONArray args)
 	 * 
 	 * Called on socket thread.
 	 * 
-	 * @param object
+	 * @param object received json message
 	 * @throws IOException
 	 *             can be thrown when socket exception occur
 	 * @throws InterruptedException
@@ -116,7 +116,7 @@ public void onReceivedJsonMessage(JSONObject object) throws IOException,
 	 * 
 	 * Called on socket thread.
 	 * 
-	 * @param string
+	 * @param string received string message
 	 * @throws IOException
 	 *             can be thrown when socket exception occur
 	 * @throws InterruptedException
@@ -133,7 +133,7 @@ public void onReceivedStringMessage(String string) throws IOException,
 	 * 
 	 * Called on socket thread.
 	 * 
-	 * @param messageData
+	 * @param messageData received message data
 	 * @throws IOException
 	 *             can be thrown when socket exception occur
 	 * @throws InterruptedException
@@ -148,30 +148,30 @@ public void onReceiverError(Optional<String> messageData)
 	 * {@link WrongSocketIOResponse} exception occurs client would be
 	 * disconnected
 	 * 
-	 * @param exception
+	 * @param exception received exception
 	 */
-	public void onNetworkError(WrongSocketIOResponse e);
+	public void onNetworkError(WrongSocketIOResponse exception);
 
 	/**
 	 * {@link IOException} exception occurs client would be disconnected
 	 * 
-	 * @param exception
+	 * @param exception received exception
 	 */
-	public void onNetworkError(IOException e);
+	public void onNetworkError(IOException exception);
 
 	/**
 	 * {@link WrongWebsocketResponse} exception occurs client would be
 	 * disconnected
 	 * 
-	 * @param exception
+	 * @param exception received exception
 	 */
-	public void onNetworkError(WrongHttpResponseCode e);
+	public void onNetworkError(WrongHttpResponseCode exception);
 
 	/**
 	 * {@link WrongWebsocketResponse} exception occurs client would be
 	 * disconnected
 	 * 
-	 * @param exception
+	 * @param exception received exception
 	 */
 	public void onNetworkError(WrongWebsocketResponse exception);
 

AndroidSocketIO/src/com/appunite/socketio/SocketWriter.java

@@ -49,7 +49,8 @@ public void sendStringMessage(String messageEndpoint, String message) throws IOE
 	 * @throws InterruptedException
 	 * @throws NotConnectedException
 	 */
-	public void sendJsonMessage(String messageEndpoint, JSONObject object) throws IOException,
+	@SuppressWarnings("UnusedDeclaration")
+    public void sendJsonMessage(String messageEndpoint, JSONObject object) throws IOException,
 			InterruptedException, NotConnectedException;
 
 	/**
@@ -62,6 +63,7 @@ public void sendJsonMessage(String messageEndpoint, JSONObject object) throws IO
 	 * @throws InterruptedException
 	 * @throws NotConnectedException
 	 */
+    @SuppressWarnings("UnusedDeclaration")
 	public void sendJsonEvent(String messageEndpoint, String name, JSONArray args) throws IOException,
 			InterruptedException, NotConnectedException;