Completing the move to Java 1.7

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

Author: jpwsutton

org.eclipse.paho.client.mqttv3/src/main/java-templates/org/eclipse/paho/client/mqttv3/internal/ClientComms.java

@@ -862,4 +862,8 @@ public void publishBufferedMessage(BufferedMessage bufferedMessage) throws MqttE
 		}
 	}
 
+	public int getActualInFlight() {
+		return this.clientState.getActualInFlight();
+	}
+
 }

org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/MqttAsyncClient.java

@@ -63,7 +63,7 @@
  * <p>This class implements the non-blocking {@link IMqttAsyncClient} client interface
  * allowing applications to initiate MQTT actions and then carry on working while the
  * MQTT action completes on a background thread.
- * This implementation is compatible with all Java SE runtimes from 1.4.2 and up.
+ * This implementation is compatible with all Java SE runtimes from 1.7 and up.
  * </p>
  * <p>An application can connect to an MQTT server using:</p>
  * <ul>
@@ -480,7 +480,6 @@ private NetworkModule createNetworkModule(String address, MqttConnectOptions opt
 		try {
 			uri = new URI(address);
 		} catch (URISyntaxException e) {
-			// throw new IllegalArgumentException("Malformed URI: " + address, e); // Cannot use for Java 1.4.2
 			throw new IllegalArgumentException("Malformed URI: " + address + ", " + e.getMessage());
 		}
 
@@ -1084,8 +1083,7 @@ public void messageArrivedComplete(int messageId, int qos) throws MqttException
 	 */
 	public static String generateClientId() {
 		//length of nanoTime = 15, so total length = 19  < 65535(defined in spec)
-		//return CLIENT_ID_PREFIX + System.nanoTime(); // Cannot use for Java 1.4.2
-		return CLIENT_ID_PREFIX + (System.currentTimeMillis() * 1000000);
+		return CLIENT_ID_PREFIX + System.nanoTime();
 
 	}
 
@@ -1227,8 +1225,7 @@ private void startReconnectCycle(){
 		String methodName = "startReconnectCycle";
 		//@Trace 503=Start reconnect timer for client: {0}, delay: {1}
 		log.fine(CLASS_NAME, methodName, "503", new Object[]{this.clientId, new Long(reconnectDelay)});
-		//reconnectTimer = new Timer("MQTT Reconnect: " + clientId); // Cannot use for Java 1.4.2
-		reconnectTimer = new Timer();
+		reconnectTimer = new Timer("MQTT Reconnect: " + clientId);
 		reconnectTimer.schedule(new ReconnectTask(), reconnectDelay);
 	}
 
@@ -1307,7 +1304,7 @@ public MqttMessage getBufferedMessage(int bufferIndex){
 	public void deleteBufferedMessage(int bufferIndex){
 		this.comms.deleteBufferedMessage(bufferIndex);
 	}
-	
+
 	/**
 	 * Returns the current number of outgoing in-flight messages
 	 * being sent by the client. Note that this number cannot be

org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/MqttClient.java

@@ -3,11 +3,11 @@
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
- * and Eclipse Distribution License v1.0 which accompany this distribution. 
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
  *
- * The Eclipse Public License is available at 
+ * The Eclipse Public License is available at
  *    http://www.eclipse.org/legal/epl-v10.html
- * and the Eclipse Distribution License is available at 
+ * and the Eclipse Distribution License is available at
  *   http://www.eclipse.org/org/documents/edl-v10.php.
  *
  * Contributors:
@@ -32,14 +32,14 @@
  *
  * <p>This class implements the blocking {@link IMqttClient} client interface where all
  * actions block until they have completed (or timed out).
- * This implementation is compatible with all Java SE runtimes from 1.4.2 and up.
+ * This implementation is compatible with all Java SE runtimes from 1.7 and up.
  * </p>
  * <p>An application can connect to an MQTT server using:</p>
  * <ul>
  * <li>A plain TCP socket
  * <li>An secure SSL/TLS socket
  * </ul>
- * 
+ *
  * <p>To enable messages to be delivered even across network and client restarts
  * messages need to be safely stored until the message has been delivered at the requested
  * quality of service. A pluggable persistence mechanism is provided to store the messages.
@@ -331,7 +331,7 @@ public void connect() throws MqttSecurityException, MqttException {
 	public void connect(MqttConnectOptions options) throws MqttSecurityException, MqttException {
 		aClient.connect(options, null, null).waitForCompletion(getTimeToWait());
 	}
-	
+
 	/*
 	 * @see IMqttClient#connect(MqttConnectOptions)
 	 */
@@ -357,7 +357,7 @@ public void disconnect(long quiesceTimeout) throws MqttException {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see org.eclipse.paho.client.mqttv3.IMqttAsyncClient#disconnectForcibly()
 	 */
 	public void disconnectForcibly() throws MqttException {
@@ -366,7 +366,7 @@ public void disconnectForcibly() throws MqttException {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see org.eclipse.paho.client.mqttv3.IMqttAsyncClient#disconnectForcibly(long)
 	 */
 	public void disconnectForcibly(long disconnectTimeout) throws MqttException {
@@ -375,7 +375,7 @@ public void disconnectForcibly(long disconnectTimeout) throws MqttException {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see org.eclipse.paho.client.mqttv3.IMqttAsyncClient#disconnectForcibly(long, long)
 	 */
 	public void disconnectForcibly(long quiesceTimeout, long disconnectTimeout) throws MqttException {
@@ -387,7 +387,7 @@ public void disconnectForcibly(long quiesceTimeout, long disconnectTimeout) thro
 	 * <p>
 	 * Because the client is able to establish the TCP/IP connection to a none MQTT server and it will certainly fail to
 	 * send the disconnect packet.
-	 * 
+	 *
 	 * @param quiesceTimeout the amount of time in milliseconds to allow for existing work to finish before
 	 * disconnecting. A value of zero or less means the client will not quiesce.
 	 * @param disconnectTimeout the amount of time in milliseconds to allow send disconnect packet to server.
@@ -437,14 +437,14 @@ public void subscribe(String[] topicFilters, int[] qos) throws MqttException {
 			throw new MqttException(MqttException.REASON_CODE_SUBSCRIBE_FAILED);
 		}
 	}
-	
+
 	/* (non-Javadoc)
 	 * @see org.eclipse.paho.client.mqttv3.IMqttClient#subscribe(java.lang.String, int, java.lang.Object, org.eclipse.paho.client.mqttv3.IMqttActionListener)
 	 */
 	public void subscribe(String topicFilter, IMqttMessageListener messageListener) throws MqttException {
 		this.subscribe(new String[] {topicFilter}, new int[] {1}, new IMqttMessageListener[] {messageListener});
 	}
-	
+
 	/* (non-Javadoc)
 	 * @see org.eclipse.paho.client.mqttv3.IMqttClient#subscribe(java.lang.String, int, java.lang.Object, org.eclipse.paho.client.mqttv3.IMqttActionListener)
 	 */
@@ -463,23 +463,23 @@ public void subscribe(String topicFilter, int qos, IMqttMessageListener messageL
 		this.subscribe(new String[] {topicFilter}, new int[] {qos}, new IMqttMessageListener[] {messageListener});
 	}
 
-	
-	public void subscribe(String[] topicFilters, int[] qos, IMqttMessageListener[] messageListeners) throws MqttException {			
+
+	public void subscribe(String[] topicFilters, int[] qos, IMqttMessageListener[] messageListeners) throws MqttException {
 		this.subscribe(topicFilters, qos);
-		
+
 		// add message handlers to the list for this client
 		for (int i = 0; i < topicFilters.length; ++i) {
 			aClient.comms.setMessageListener(topicFilters[i], messageListeners[i]);
 		}
 	}
-	
+
 	/*
 	 * @see IMqttClient#subscribeWithResponse(String)
 	 */
 	public IMqttToken subscribeWithResponse(String topicFilter) throws MqttException {
 		return this.subscribeWithResponse(new String[] {topicFilter}, new int[] {1});
 	}
-	
+
 	/*
 	 * @see IMqttClient#subscribeWithResponse(String, IMqttMessageListener)
 	 */
@@ -540,7 +540,7 @@ public IMqttToken subscribeWithResponse(String[] topicFilters, int[] qos) throws
 	public IMqttToken subscribeWithResponse(String[] topicFilters, int[] qos, IMqttMessageListener[] messageListeners)
 			throws MqttException {
 		IMqttToken tok = this.subscribeWithResponse(topicFilters, qos);
-		
+
 		// add message handlers to the list for this client
 		for (int i = 0; i < topicFilters.length; ++i) {
 			aClient.comms.setMessageListener(topicFilters[i], messageListeners[i]);
@@ -645,16 +645,16 @@ public IMqttDeliveryToken[] getPendingDeliveryTokens() {
 	public String getServerURI() {
 		return aClient.getServerURI();
 	}
-	
+
 	/**
 	 * Returns the currently connected Server URI
 	 * Implemented due to: https://bugs.eclipse.org/bugs/show_bug.cgi?id=481097
-	 * 
+	 *
 	 * Where getServerURI only returns the URI that was provided in
 	 * MqttAsyncClient's constructor, getCurrentServerURI returns the URI of the
 	 * Server that the client is currently connected to. This would be different in scenarios
 	 * where multiple server URIs have been provided to the MqttConnectOptions.
-	 * 
+	 *
 	 * @return the currently connected server URI
 	 */
 	public String getCurrentServerURI(){
@@ -681,14 +681,14 @@ public boolean isConnected() {
 	public void setCallback(MqttCallback callback) {
 		aClient.setCallback(callback);
 	}
-	
+
 	/* (non-Javadoc)
 	 * @see org.eclipse.paho.client.mqttv3.IMqttClient#setCallback(org.eclipse.paho.client.mqttv3.MqttCallback)
 	 */
 	public void setManualAcks(boolean manualAcks) {
 		aClient.setManualAcks(manualAcks);
 	}
-	
+
 	public void messageArrivedComplete(int messageId, int qos) throws MqttException {
 		aClient.messageArrivedComplete(messageId, qos);
 	}
@@ -705,7 +705,7 @@ public void messageArrivedComplete(int messageId, int qos) throws MqttException
 	public static String generateClientId() {
 		return MqttAsyncClient.generateClientId();
 	}
-	
+
 	/**
 	 * Will attempt to reconnect to the server after the client has lost connection.
 	 * @throws MqttException if an error occurs attempting to reconnect
@@ -721,5 +721,5 @@ public void reconnect() throws MqttException {
 	public Debug getDebug() {
 		return (aClient.getDebug());
 	}
-	
+
 }