Cleaning up unused files in V3 and V5 clients

Signed-off-by: James Sutton <james.sutton@uk.ibm.com>

Author: jpwsutton

org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/ClientDefaults.java

@@ -19,7 +19,6 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.ConnectException;
-import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.net.SocketAddress;

org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/TCPNetworkModule.java

@@ -88,9 +88,6 @@ public class ClientComms {
 	private ExecutorService executorService;
 	private MqttSession mqttSession;
 
-
-
-
 	/**
 	 * Creates a new ClientComms object, using the specified module to handle the
 	 * network calls.
@@ -104,7 +101,7 @@ public class ClientComms {
 	 * @param executorService
 	 *            the {@link ExecutorService}
 	 * @param mqttSession
-	 * 			 the {@link MqttSession}
+	 *            the {@link MqttSession}
 	 * @throws MqttException
 	 *             if an exception occurs whilst communicating with the server
 	 */
@@ -208,16 +205,16 @@ public void sendNoWait(MqttWireMessage message, MqttToken token) throws MqttExce
 
 				if (message instanceof MqttPublish) {
 					// Override the QoS if the server has set a maximum
-					if (this.mqttSession.getMaximumQoS()!= null &&
-							((MqttPublish) message).getMessage().getQos() > this.mqttSession.getMaximumQoS()) {
+					if (this.mqttSession.getMaximumQoS() != null
+							&& ((MqttPublish) message).getMessage().getQos() > this.mqttSession.getMaximumQoS()) {
 						MqttMessage mqttMessage = ((MqttPublish) message).getMessage();
 						mqttMessage.setQos(this.mqttSession.getMaximumQoS());
 						((MqttPublish) message).setMessage(mqttMessage);
 					}
 
 					// Override the Retain flag if the server has disabled it
-					if (this.mqttSession.isRetainAvailable()!= null &&
-							((MqttPublish) message).getMessage().isRetained()
+					if (this.mqttSession.isRetainAvailable() != null
+							&& ((MqttPublish) message).getMessage().isRetained()
 							&& (this.mqttSession.isRetainAvailable() == false)) {
 						MqttMessage mqttMessage = ((MqttPublish) message).getMessage();
 						mqttMessage.setRetained(false);
@@ -316,11 +313,8 @@ public void connect(MqttConnectionOptions options, MqttToken token) throws MqttE
 						conOptions.isCleanSession(), conOptions.getKeepAliveInterval(),
 						conOptions.getConnectionProperties(), conOptions.getWillMessageProperties());
 
-				System.err.println(connect.toString());
-
 				if (conOptions.getWillDestination() != null) {
 					connect.setWillDestination(conOptions.getWillDestination());
-
 				}
 
 				if (conOptions.getWillMessage() != null) {
@@ -602,7 +596,7 @@ public void disconnectForcibly(long quiesceTimeout, long disconnectTimeout, int
 	 * @param reasonCode
 	 *            the disconnection reason code.
 	 * @param disconnectProperties
-	 * 			  the {@link MqttProperties} to send in the Disconnect packet.
+	 *            the {@link MqttProperties} to send in the Disconnect packet.
 	 * @throws MqttException
 	 *             if an error occurs whilst disconnecting
 	 */

org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/internal/ClientComms.java

@@ -25,7 +25,7 @@
 import org.eclipse.paho.mqttv5.client.MqttToken;
 import org.eclipse.paho.mqttv5.client.logging.Logger;
 import org.eclipse.paho.mqttv5.client.logging.LoggerFactory;
-import org.eclipse.paho.mqttv5.client.oldwire.MqttInputStream;
+import org.eclipse.paho.mqttv5.client.wire.MqttInputStream;
 import org.eclipse.paho.mqttv5.common.MqttException;
 import org.eclipse.paho.mqttv5.common.packet.MqttAck;
 import org.eclipse.paho.mqttv5.common.packet.MqttDisconnect;

org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/internal/ClientDefaults.java

@@ -26,7 +26,7 @@
 import org.eclipse.paho.mqttv5.client.MqttToken;
 import org.eclipse.paho.mqttv5.client.logging.Logger;
 import org.eclipse.paho.mqttv5.client.logging.LoggerFactory;
-import org.eclipse.paho.mqttv5.client.oldwire.MqttOutputStream;
+import org.eclipse.paho.mqttv5.client.wire.MqttOutputStream;
 import org.eclipse.paho.mqttv5.common.MqttException;
 import org.eclipse.paho.mqttv5.common.packet.MqttAck;
 import org.eclipse.paho.mqttv5.common.packet.MqttDisconnect;

org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/internal/CommsReceiver.java

@@ -114,7 +114,6 @@ public void onSuccess(IMqttToken token) {
 
 		// Set properties imposed on us by the Server
 		MqttToken myToken = (MqttToken) token;
-		System.out.println(myToken.getMessageProperties().toString());
 		mqttSession.setReceiveMaximum(myToken.getMessageProperties().getReceiveMaximum());
 		mqttSession.setMaximumQoS(myToken.getMessageProperties().getMaximumQoS());
 		mqttSession.setRetainAvailable(myToken.getMessageProperties().isRetainAvailable());