General Clean up of warnings.

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/websocket/WebSocketHandshake.java

@@ -127,7 +127,7 @@ private void sendHandshakeRequest(String key) throws IOException{
 	 */
 	private void receiveHandshakeResponse(String key) throws IOException {
 		BufferedReader in = new BufferedReader(new InputStreamReader(input));
-		ArrayList responseLines = new ArrayList();
+		ArrayList<String> responseLines = new ArrayList<String>();
 		String line = in.readLine();
 		if(line == null){
 			throw new IOException("WebSocket Response header: Invalid response from Server, It may not support WebSockets.");
@@ -136,7 +136,7 @@ private void receiveHandshakeResponse(String key) throws IOException {
 			responseLines.add(line);
 			line = in.readLine();
 		}
-		Map headerMap = getHeaders(responseLines);
+		Map<String, String> headerMap = getHeaders(responseLines);
 
 		String connectionHeader = (String) headerMap.get(HTTP_HEADER_CONNECTION);
 		if (connectionHeader == null || connectionHeader.equalsIgnoreCase(HTTP_HEADER_CONNECTION_VALUE)) {
@@ -172,8 +172,8 @@ private void receiveHandshakeResponse(String key) throws IOException {
 	 * @param ArrayList<String> of headers
 	 * @return A Hashmap<String, String> of the headers
 	 */
-	private Map getHeaders(ArrayList headers){
-		Map headerMap = new HashMap();
+	private Map<String, String> getHeaders(ArrayList<String> headers){
+		Map<String, String> headerMap = new HashMap<String, String>();
 		for(int i = 1; i < headers.size(); i++){
 			String headerPre = (String) headers.get(i);
 			String[] header =  headerPre.split(":");

org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/persist/MqttDefaultFilePersistence.java

@@ -16,7 +16,6 @@
 package org.eclipse.paho.client.mqttv3.persist;
 
 import java.io.File;
-import java.io.FileFilter;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.FilenameFilter;
@@ -237,10 +236,10 @@ public void remove(String key) throws MqttPersistenceException {
 	 * @return all of the persistent data from the persistence directory.
 	 * @throws MqttPersistenceException if an exception is thrown whilst getting the keys
 	 */
-	public Enumeration keys() throws MqttPersistenceException {
+	public Enumeration<String> keys() throws MqttPersistenceException {
 		checkIsOpen();
 		File[] files = getFiles();
-		Vector result = new Vector(files.length);
+		Vector<String> result = new Vector<String>(files.length);
 		for (int i=0;i<files.length;i++) {
 			String filename = files[i].getName();
 			String key = filename.substring(0,filename.length()-MESSAGE_FILE_EXTENSION.length());

org.eclipse.paho.mqttv5.client/src/test/java/org/eclipse/paho/mqttv5/client/test/ServerAssignedClientIdentifierTest.java

@@ -6,8 +6,6 @@
 
 import org.eclipse.paho.mqttv5.client.IMqttToken;
 import org.eclipse.paho.mqttv5.client.MqttAsyncClient;
-import org.eclipse.paho.mqttv5.client.MqttConnectionOptions;
-import org.eclipse.paho.mqttv5.client.persist.MemoryPersistence;
 import org.eclipse.paho.mqttv5.client.test.properties.TestProperties;
 import org.eclipse.paho.mqttv5.client.test.utilities.TestMemoryPersistence;
 import org.eclipse.paho.mqttv5.common.MqttException;

org.eclipse.paho.mqttv5.client/src/test/java/org/eclipse/paho/mqttv5/client/test/automaticReconnect/OfflineBufferingTest.java

@@ -386,7 +386,6 @@ public void testPersistBufferedMessages() throws Exception {
 		Assert.assertFalse(isConnected);
 
 		// Make Sure persistence is empty before publish
-		@SuppressWarnings("unchecked")
 		List<String> keys = Collections.list(persistence.keys());
 		Assert.assertEquals(0, keys.size());
 
@@ -396,7 +395,6 @@ public void testPersistBufferedMessages() throws Exception {
 		Assert.assertFalse(pubToken.isComplete());
 		// Check that message is now in persistence layer
 
-		@SuppressWarnings("unchecked")
 		List<String> keysNew = Collections.list(persistence.keys());
 		log.info("There are now: " + keysNew.size() + " keys in persistence");
 		Assert.assertEquals(1, keysNew.size());
@@ -426,7 +424,6 @@ public void testUnPersistBufferedMessagesOnNewClient() throws Exception {
 		final TestMemoryPersistence persistence = new TestMemoryPersistence();
 		persistence.open(null, null);
 		persistence.put("sb-1", (MqttPublish) pubMessage);
-		@SuppressWarnings("unchecked")
 		List<String> persistedKeys = Collections.list(persistence.keys());
 		log.info("There are now: " + persistedKeys.size() + " keys in persistence");
 		Assert.assertEquals(1, persistedKeys.size());
@@ -461,7 +458,6 @@ public void testUnPersistBufferedMessagesOnNewClient() throws Exception {
 		// Allow a few seconds for the QoS 2 flow to complete
 		Thread.sleep(2000);
 
-		@SuppressWarnings("unchecked")
 		List<String> postConnectKeys = Collections.list(persistence.keys());
 		log.info("There are now: " + postConnectKeys.size() + " keys in persistence");
 		Assert.assertEquals(0, postConnectKeys.size());

org.eclipse.paho.mqttv5.client/src/test/java/org/eclipse/paho/mqttv5/client/test/utilities/StringUtilities.java

@@ -15,15 +15,12 @@
 package org.eclipse.paho.mqttv5.client.test.utilities;
 
 import java.text.MessageFormat;
-import java.util.logging.Logger;
 
 /**
  * Static utility functions 
  */
 public class StringUtilities {
 
-  private static final String className = StringUtilities.class.getName();
-  private final static Logger log = Logger.getLogger(className);
 
   /** Lookup the line separator once */
   public static final String NL = System.getProperty("line.separator");

org.eclipse.paho.mqttv5.client/src/test/java/org/eclipse/paho/mqttv5/client/test/utilities/TestMemoryPersistence.java

@@ -26,14 +26,14 @@
  * Persistence that uses memory
  * 
  * In cases where reliability is not required across client or device 
- * restarts memory this memory peristence can be used. In cases where
+ * restarts memory this memory persistence can be used. In cases where
  * reliability is required like when clean session is set to false
  * then a non-volatile form of persistence should be used. 
  * 
  */
 public class TestMemoryPersistence implements MqttClientPersistence {
 
-	private Hashtable data;
+	private Hashtable<String, MqttPersistable> data;
 	private String clientId;
 	private String serverURI;
 
@@ -47,7 +47,7 @@ public void close() throws MqttPersistenceException {
 	/* (non-Javadoc)
 	 * @see org.eclipse.paho.client.mqttv3.MqttClientPersistence#keys()
 	 */
-	public Enumeration keys() throws MqttPersistenceException {
+	public Enumeration<String> keys() throws MqttPersistenceException {
 		return data.keys();
 	}
 
@@ -65,7 +65,7 @@ public void open(String clientId, String serverURI) throws MqttPersistenceExcept
 		this.clientId = clientId;
 		this.serverURI = serverURI;
 		if(this.data ==  null){
-			this.data = new Hashtable();
+			this.data = new Hashtable<String, MqttPersistable>();
 		}
 	}
 
@@ -100,15 +100,15 @@ public boolean containsKey(String key) throws MqttPersistenceException {
 	@Override
 	public void open(String clientId) throws MqttPersistenceException {
 		if(this.data ==  null){
-			this.data = new Hashtable();
+			this.data = new Hashtable<String, MqttPersistable>();
 		}
 	}
 
-	public Hashtable getData() {
+	public Hashtable<String, MqttPersistable> getData() {
 		return data;
 	}
 
-	public void setData(Hashtable data) {
+	public void setData(Hashtable<String, MqttPersistable> data) {
 		this.data = data;
 	}