Replaces usage of deprecated method calls with more modern alternatives

orpiske · orpiske · commit bfe401fa7e11 · 2019-02-20T21:46:27.000+01:00
Signed-off-by: Otavio R. Piske &lt;angusyoung@gmail.com&gt;
diff --git a/org.eclipse.paho.client.mqttv3.test/src/test/java/org/eclipse/paho/client/mqttv3/test/BasicTest.java b/org.eclipse.paho.client.mqttv3.test/src/test/java/org/eclipse/paho/client/mqttv3/test/BasicTest.java
@@ -319,7 +319,7 @@ public void testConnOptDefaults() throws Exception {
 
     log.info("Check MqttConnectOptions defaults");
     MqttConnectOptions connOpts = new MqttConnectOptions();
-    Assert.assertEquals(new Integer(connOpts.getKeepAliveInterval()), new Integer(60));
+    Assert.assertEquals(Integer.valueOf(connOpts.getKeepAliveInterval()), Integer.valueOf(60));
     Assert.assertNull(connOpts.getPassword());
     Assert.assertNull(connOpts.getUserName());
     Assert.assertNull(connOpts.getSocketFactory());
diff --git a/org.eclipse.paho.client.mqttv3.test/src/test/java/org/eclipse/paho/client/mqttv3/test/ModelTestCase.java b/org.eclipse.paho.client.mqttv3.test/src/test/java/org/eclipse/paho/client/mqttv3/test/ModelTestCase.java
@@ -470,7 +470,7 @@ public void subscribe() throws Exception {
   public void subscribe(String topic, int qos, boolean expectRetained) throws Exception {
     logToFile("subscribe [topic:" + topic + "][qos:" + qos + "][expectRetained:" + expectRetained
               + "]");
-    subscribedTopics.put(topic, new Integer(qos));
+    subscribedTopics.put(topic, Integer.valueOf(qos));
     client.subscribe(topic, qos);
     if (expectRetained) {
       waitForMessage(topic, retainedPublishes.get(topic), true);
diff --git a/org.eclipse.paho.client.mqttv3/src/main/java-templates/org/eclipse/paho/client/mqttv3/internal/ClientComms.java b/org.eclipse.paho.client.mqttv3/src/main/java-templates/org/eclipse/paho/client/mqttv3/internal/ClientComms.java
@@ -667,7 +667,7 @@ public Properties getDebug() {
 		props.put("conState", Integer.valueOf(conState));
 		props.put("serverURI", getClient().getServerURI());
 		props.put("callback", callback);
-		props.put("stoppingComms", new Boolean(stoppingComms));
+		props.put("stoppingComms", Boolean.valueOf(stoppingComms));
 		return props;
 	}
 
diff --git a/org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/MqttAsyncClient.java b/org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/MqttAsyncClient.java
@@ -617,7 +617,7 @@ public IMqttToken connect(MqttConnectOptions options, Object userContext, IMqttA
 		// @TRACE 103=cleanSession={0} connectionTimeout={1} TimekeepAlive={2}
 		// userName={3} password={4} will={5} userContext={6} callback={7}
 		log.fine(CLASS_NAME, methodName, "103",
-				new Object[] { Boolean.valueOf(options.isCleanSession()), new Integer(options.getConnectionTimeout()),
+				new Object[] { Boolean.valueOf(options.isCleanSession()), Integer.valueOf(options.getConnectionTimeout()),
 						Integer.valueOf(options.getKeepAliveInterval()), options.getUserName(),
 						((null == options.getPassword()) ? "[null]" : "[notnull]"),
 						((null == options.getWillMessage()) ? "[null]" : "[notnull]"), userContext, callback });
diff --git a/org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/Token.java b/org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/Token.java
@@ -137,7 +137,7 @@ protected MqttWireMessage waitForResponse(long timeout) throws MqttException {
 				if (this.exception == null) {
 					try {
 						//@TRACE 408=key={0} wait max={1}
-						log.fine(CLASS_NAME,methodName,"408",new Object[] {getKey(),new Long(timeout)});
+						log.fine(CLASS_NAME,methodName,"408",new Object[] {getKey(), Long.valueOf(timeout)});
 	
 						if (timeout <= 0) {
 							responseLock.wait();
diff --git a/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/MqttAsyncClient.java b/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/MqttAsyncClient.java
@@ -747,8 +747,8 @@ public IMqttToken connect(MqttConnectionOptions options, Object userContext, Mqt
 		// @TRACE 103=cleanStart={0} connectionTimeout={1} TimekeepAlive={2}
 		// userName={3} password={4} will={5} userContext={6} callback={7}
 		log.fine(CLASS_NAME, methodName, "103",
-				new Object[] { Boolean.valueOf(options.isCleanStart()), new Integer(options.getConnectionTimeout()),
-						new Integer(options.getKeepAliveInterval()), options.getUserName(),
+				new Object[] { Boolean.valueOf(options.isCleanStart()), Integer.valueOf(options.getConnectionTimeout()),
+						Integer.valueOf(options.getKeepAliveInterval()), options.getUserName(),
 						((null == options.getPassword()) ? "[null]" : "[notnull]"),
 						((null == options.getWillMessage()) ? "[null]" : "[notnull]"), userContext, callback });
 		comms.setNetworkModules(createNetworkModules(serverURI, options));
@@ -828,7 +828,7 @@ public IMqttToken disconnect(long quiesceTimeout, Object userContext, MqttAction
 			MqttProperties disconnectProperties) throws MqttException {
 		final String methodName = "disconnect";
 		// @TRACE 104=> quiesceTimeout={0} userContext={1} callback={2}
-		log.fine(CLASS_NAME, methodName, "104", new Object[] { new Long(quiesceTimeout), userContext, callback });
+		log.fine(CLASS_NAME, methodName, "104", new Object[] { Long.valueOf(quiesceTimeout), userContext, callback });
 
 		MqttToken token = new MqttToken(getClientId());
 		token.setActionCallback(callback);
@@ -1578,7 +1578,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.mqttSession.getClientId(), new Long(reconnectDelay) });
+				new Object[] { this.mqttSession.getClientId(), Long.valueOf(reconnectDelay) });
 		reconnectTimer = new Timer("MQTT Reconnect: " + this.mqttSession.getClientId());
 		reconnectTimer.schedule(new ReconnectTask(), reconnectDelay);
 	}
diff --git a/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/TimerPingSender.java b/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/TimerPingSender.java
@@ -101,7 +101,7 @@ private class PingTask extends TimerTask {
 		public void run() {
 			Thread.currentThread().setName("MQTT Ping: " + clientid);
 			//@Trace 660=Check schedule at {0}
-			log.fine(CLASS_NAME, methodName, "660", new Object[]{ new Long(System.nanoTime()) });
+			log.fine(CLASS_NAME, methodName, "660", new Object[]{ Long.valueOf(System.nanoTime()) });
 			comms.checkForActivity();
 		}
 	}
@@ -113,7 +113,7 @@ public void run() {
 			String originalThreadName = Thread.currentThread().getName();
 			Thread.currentThread().setName("MQTT Ping: " + clientid);
 			//@Trace 660=Check schedule at {0}
-			log.fine(CLASS_NAME, methodName, "660", new Object[]{ new Long(System.nanoTime()) });
+			log.fine(CLASS_NAME, methodName, "660", new Object[]{ Long.valueOf(System.nanoTime()) });
 			comms.checkForActivity();
 			Thread.currentThread().setName(originalThreadName);
 		}
diff --git a/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/internal/ClientComms.java b/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/internal/ClientComms.java
@@ -332,7 +332,7 @@ public void connect(MqttConnectionOptions options, MqttToken token) throws MqttE
 				conbg.start();
 			} else {
 				// @TRACE 207=connect failed: not disconnected {0}
-				log.fine(CLASS_NAME, methodName, "207", new Object[] { new Byte(conState) });
+				log.fine(CLASS_NAME, methodName, "207", new Object[] { Byte.valueOf(conState) });
 				if (isClosed() || closePending) {
 					throw new MqttException(MqttClientException.REASON_CODE_CLIENT_CLOSED);
 				} else if (isConnecting()) {
@@ -361,7 +361,7 @@ public void connectComplete(MqttConnAck cack, MqttException mex) throws MqttExce
 		}
 
 		// @TRACE 204=connect failed: rc={0}
-		log.fine(CLASS_NAME, methodName, "204", new Object[] { new Integer(rc) });
+		log.fine(CLASS_NAME, methodName, "204", new Object[] { Integer.valueOf(rc) });
 		throw mex;
 	}
 
@@ -724,10 +724,10 @@ public MqttConnectionOptions getConOptions() {
 
 	public Properties getDebug() {
 		Properties props = new Properties();
-		props.put("conState", new Integer(conState));
+		props.put("conState", Integer.valueOf(conState));
 		props.put("serverURI", getClient().getServerURI());
 		props.put("callback", callback);
-		props.put("stoppingComms", new Boolean(stoppingComms));
+		props.put("stoppingComms", Boolean.valueOf(stoppingComms));
 		return props;
 	}
 
diff --git a/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/internal/ClientState.java b/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/internal/ClientState.java
@@ -968,7 +968,7 @@ protected boolean checkQuiesceLock() {
 			// @TRACE 626=quiescing={0} actualInFlight={1} pendingFlows={2}
 			// inFlightPubRels={3} callbackQuiesce={4} tokens={5}
 			log.fine(CLASS_NAME, methodName, "626",
-					new Object[] { new Boolean(quiescing), Integer.valueOf(actualInFlight),
+					new Object[] { Boolean.valueOf(quiescing), Integer.valueOf(actualInFlight),
 							Integer.valueOf(pendingFlows.size()), Integer.valueOf(inFlightPubRels),
 							Boolean.valueOf(callback.isQuiesced()), Integer.valueOf(tokC) });
 			synchronized (quiesceLock) {
diff --git a/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/internal/CommsCallback.java b/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/internal/CommsCallback.java
@@ -477,7 +477,7 @@ private void handleMessage(MqttPublish publishMessage) throws Exception {
 		String destName = publishMessage.getTopicName();
 
 		// @TRACE 713=call messageArrived key={0} topic={1}
-		log.fine(CLASS_NAME, methodName, "713", new Object[] { new Integer(publishMessage.getMessageId()), destName });
+		log.fine(CLASS_NAME, methodName, "713", new Object[] { Integer.valueOf(publishMessage.getMessageId()), destName });
 		deliverMessage(destName, publishMessage.getMessageId(), publishMessage.getMessage());
 
 		// If we are not in manual ACK mode:
diff --git a/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/internal/CommsTokenStore.java b/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/internal/CommsTokenStore.java
@@ -109,7 +109,7 @@ protected MqttDeliveryToken restoreToken(MqttPublish message) {
 		final String methodName = "restoreToken";
 		MqttDeliveryToken token;
 		synchronized(tokens) {
-			String key = new Integer(message.getMessageId()).toString();
+			String key = Integer.valueOf(message.getMessageId()).toString();
 			if (this.tokens.containsKey(key)) {
 				token = (MqttDeliveryToken)this.tokens.get(key);
 				//@TRACE 302=existing key={0} message={1} token={2}
@@ -227,7 +227,7 @@ public Vector<MqttToken> getOutstandingTokens() {
 	public void clear() {
 		final String methodName = "clear";
 		//@TRACE 305=> {0} tokens
-		log.fine(CLASS_NAME, methodName, "305", new Object[] {new Integer(tokens.size())});
+		log.fine(CLASS_NAME, methodName, "305", new Object[] { Integer.valueOf(tokens.size())});
 		synchronized(tokens) {
 			tokens.clear();
 		}
diff --git a/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/internal/TCPNetworkModule.java b/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/internal/TCPNetworkModule.java
@@ -69,7 +69,7 @@ public void start() throws IOException, MqttException {
 		final String methodName = "start";
 		try {
 			// @TRACE 252=connect to host {0} port {1} timeout {2}
-			log.fine(CLASS_NAME,methodName, "252", new Object[] {host, new Integer(port), new Long(conTimeout*1000)});
+			log.fine(CLASS_NAME,methodName, "252", new Object[] {host, Integer.valueOf(port), Long.valueOf(conTimeout*1000)});
 			SocketAddress sockaddr = new InetSocketAddress(host, port);
 			socket = factory.createSocket();
 			socket.connect(sockaddr, conTimeout*1000);
diff --git a/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/internal/Token.java b/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/internal/Token.java
@@ -112,7 +112,7 @@ public void waitForCompletion() throws MqttException {
 	public void waitForCompletion(long timeout) throws MqttException {
 		final String methodName = "waitForCompletion";
 		// @TRACE 407=key={0} wait max={1} token={2}
-		log.fine(CLASS_NAME, methodName, "407", new Object[] { getKey(), new Long(timeout), this });
+		log.fine(CLASS_NAME, methodName, "407", new Object[] { getKey(), Long.valueOf(timeout), this });
 
 		MqttWireMessage resp = null;
 		try {
@@ -152,15 +152,15 @@ protected MqttWireMessage waitForResponse(long timeout) throws MqttException {
 			// @TRACE 400=>key={0} timeout={1} sent={2} completed={3} hasException={4}
 			// response={5} token={6}
 			log.fine(
-					CLASS_NAME, methodName, "400", new Object[] { getKey(), new Long(timeout), new Boolean(sent),
-							new Boolean(completed), (exception == null) ? "false" : "true", response, this },
+					CLASS_NAME, methodName, "400", new Object[] { getKey(), Long.valueOf(timeout), Boolean.valueOf(sent),
+							Boolean.valueOf(completed), (exception == null) ? "false" : "true", response, this },
 					exception);
 
 			while (!this.completed) {
 				if (this.exception == null) {
 					try {
 						// @TRACE 408=key={0} wait max={1}
-						log.fine(CLASS_NAME, methodName, "408", new Object[] { getKey(), new Long(timeout) });
+						log.fine(CLASS_NAME, methodName, "408", new Object[] { getKey(), Long.valueOf(timeout) });
 
 						if (timeout <= 0) {
 							responseLock.wait();
diff --git a/org.eclipse.paho.mqttv5.common/src/main/java/org/eclipse/paho/mqttv5/common/util/MqttTopicValidator.java b/org.eclipse.paho.mqttv5.common/src/main/java/org/eclipse/paho/mqttv5/common/util/MqttTopicValidator.java
@@ -65,7 +65,7 @@ public static void validate(String topicString, boolean wildcardAllowed, boolean
 		// NOT encode to more than 65535 bytes
 		if (topicLen < MIN_TOPIC_LEN || topicLen > MAX_TOPIC_LEN) {
 			throw new IllegalArgumentException(String.format("Invalid topic length, should be in range[%d, %d]!",
-					new Object[] { new Integer(MIN_TOPIC_LEN), new Integer(MAX_TOPIC_LEN) }));
+					new Object[] { Integer.valueOf(MIN_TOPIC_LEN), Integer.valueOf(MAX_TOPIC_LEN) }));
 		}
 
 		// *******************************************************************************
diff --git a/org.eclipse.paho.sample.utility/src/main/java/org/eclipse/paho/sample/utility/ConnOpts.java b/org.eclipse.paho.sample.utility/src/main/java/org/eclipse/paho/sample/utility/ConnOpts.java
@@ -89,7 +89,7 @@ public ConnOpts( MQTTFrame mgr, Properties props ) {
 
         // Should persistence be used for the WMQtt connection?
         persistEnable = new JCheckBox();
-        Boolean b = new Boolean( props.getProperty( "Persistence", String.valueOf(false) ) );
+        Boolean b = Boolean.valueOf( props.getProperty( "Persistence", String.valueOf(false) ) );
         persistEnable.setSelected( b.booleanValue() );
         persistEnable.setToolTipText("Persist publications to ensure delivery");
                 
@@ -268,7 +268,7 @@ public String getPersistenceDirectory() {
     public short getKeepAlive() {
     	Integer i;
     	try {
-    		i = new Integer( keepAlive.getText() );
+    		i = Integer.valueOf( keepAlive.getText() );
     	} catch ( NumberFormatException e) {
     		// Invalid entry set - use the default
     		keepAlive.setText(KEEP_ALIVE);
@@ -284,7 +284,7 @@ public short getKeepAlive() {
     public int getRetryInterval() {
     	Integer i;
     	try {
-    		i = new Integer( retryInterval.getText() );
+    		i = Integer.valueOf( retryInterval.getText() );
     	} catch ( NumberFormatException e) {
     		// Invalid entry set - use the default
     		retryInterval.setText(RETRY_INT);

Original file line number	Diff line number	Diff line change
`@@ -667,7 +667,7 @@ public Properties getDebug() {`
`667`	`667`	`props.put("conState", Integer.valueOf(conState));`
`668`	`668`	`props.put("serverURI", getClient().getServerURI());`
`669`	`669`	`props.put("callback", callback);`
`670`		`- props.put("stoppingComms", new Boolean(stoppingComms));`
	`670`	`+ props.put("stoppingComms", Boolean.valueOf(stoppingComms));`
`671`	`671`	`return props;`
`672`	`672`	`}`
`673`	`673`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ private class PingTask extends TimerTask {`
`101`	`101`	`public void run() {`
`102`	`102`	`Thread.currentThread().setName("MQTT Ping: " + clientid);`
`103`	`103`	`//@Trace 660=Check schedule at {0}`
`104`		`- log.fine(CLASS_NAME, methodName, "660", new Object[]{ new Long(System.nanoTime()) });`
	`104`	`+ log.fine(CLASS_NAME, methodName, "660", new Object[]{ Long.valueOf(System.nanoTime()) });`
`105`	`105`	`comms.checkForActivity();`
`106`	`106`	`}`
`107`	`107`	`}`
`@@ -113,7 +113,7 @@ public void run() {`
`113`	`113`	`String originalThreadName = Thread.currentThread().getName();`
`114`	`114`	`Thread.currentThread().setName("MQTT Ping: " + clientid);`
`115`	`115`	`//@Trace 660=Check schedule at {0}`
`116`		`- log.fine(CLASS_NAME, methodName, "660", new Object[]{ new Long(System.nanoTime()) });`
	`116`	`+ log.fine(CLASS_NAME, methodName, "660", new Object[]{ Long.valueOf(System.nanoTime()) });`
`117`	`117`	`comms.checkForActivity();`
`118`	`118`	`Thread.currentThread().setName(originalThreadName);`
`119`	`119`	`}`