Fixing paho java client to minimum JRE 1.4.2+ source (Issue #218) (#273)

* Fixing mqttv3 source to be compatible with Java 1.4.2+

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/MqttAsyncClient.java

@@ -957,7 +957,9 @@ 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();
+		//return CLIENT_ID_PREFIX + System.nanoTime(); // Cannot use for Java 1.4.2
+		return CLIENT_ID_PREFIX + (System.currentTimeMillis() * 1000000);
+		
 	}
 
 	/* (non-Javadoc)
@@ -1097,7 +1099,8 @@ 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);
+		//reconnectTimer = new Timer("MQTT Reconnect: " + clientId); // Cannot use for Java 1.4.2
+		reconnectTimer = new Timer();
 		reconnectTimer.schedule(new ReconnectTask(), reconnectDelay);
 	}
 

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

@@ -146,7 +146,8 @@ public static void validate(String topicString, boolean wildcardAllowed)
 		try {
 			topicLen = topicString.getBytes("UTF-8").length;
 		} catch (UnsupportedEncodingException e) {
-			throw new IllegalStateException(e);
+			// throw new IllegalStateException(e);  // Cannot use for Java 1.4.2
+			throw new IllegalStateException(e.getMessage());
 		}
 
 		// Spec: length check
@@ -155,8 +156,10 @@ public static void validate(String topicString, boolean wildcardAllowed)
 		// - Topic Names and Topic Filters are UTF-8 encoded strings, they MUST
 		// 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) }));
+			//throw new IllegalArgumentException(String.format("Invalid topic length, should be in range[%d, %d]!", // Cannot use for Java 1.4.2
+			//		new Object[] { new Integer(MIN_TOPIC_LEN), new Integer(MAX_TOPIC_LEN) }));
+			String errorMessage = "Invalid topic length, should be in range["+ MIN_TOPIC_LEN + ", " + MAX_TOPIC_LEN + "]!";
+			throw new IllegalArgumentException(errorMessage);
 		}
 
 		// *******************************************************************************
@@ -177,7 +180,8 @@ public static void validate(String topicString, boolean wildcardAllowed)
 			// - The multi-level wildcard must be the last character used within
 			// the topic tree
 			if (Strings.countMatches(topicString, MULTI_LEVEL_WILDCARD) > 1
-					|| (topicString.contains(MULTI_LEVEL_WILDCARD) && !topicString
+					//|| (topicString.contains(MULTI_LEVEL_WILDCARD) && !topicString// Cannot use for Java 1.4.2
+					|| ((topicString.indexOf(MULTI_LEVEL_WILDCARD) != -1) && !topicString
 							.endsWith(MULTI_LEVEL_WILDCARD_PATTERN))) {
 				throw new IllegalArgumentException(
 						"Invalid usage of multi-level wildcard in topic string: "
@@ -219,9 +223,11 @@ private static void validateSingleLevelWildcard(String topicString) {
             if (chars[i] == singleLevelWildcardChar) {
                 // prev and next can be only '/' or none
                 if (prev != topicLevelSeparatorChar && prev != NUL || next != topicLevelSeparatorChar && next != NUL) {
-                    throw new IllegalArgumentException(String.format(
-                            "Invalid usage of single-level wildcard in topic string '%s'!",
-                            new Object[] { topicString }));
+//                    throw new IllegalArgumentException(String.format( // Cannot use for Java 1.4.2
+//                            "Invalid usage of single-level wildcard in topic string '%s'!",
+//                            new Object[] { topicString }));
+                    String errorMessage = "Invalid usage of single-level wildcard in topic string '" + topicString + "'!";
+                    throw new IllegalArgumentException(errorMessage);
                 }
             }
         }

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

@@ -50,7 +50,8 @@ public void start() {
 		//@Trace 659=start timer for client:{0}
 		log.fine(CLASS_NAME, methodName, "659", new Object[]{clientid});
 
-		timer = new Timer("MQTT Ping: " + clientid);
+		//timer = new Timer("MQTT Ping: " + clientid);  // Cannot use for Java 1.4.2
+		timer = new Timer();
 		//Check ping after first keep alive interval.
 		timer.schedule(new PingTask(), comms.getKeepAlive());
 	}

org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/websocket/WebSocketHandshake.java

@@ -84,9 +84,11 @@ private void sendHandshakeRequest(String key) throws IOException{
 		try {
 			String path = "/mqtt";
 			URI srvUri = new URI(uri);
-			if (srvUri.getRawPath() != null && !srvUri.getRawPath().isEmpty()) {
+			//if (srvUri.getRawPath() != null && !srvUri.getRawPath().isEmpty()) { // Cannot use for Java 1.4.2
+			if (srvUri.getRawPath() != null && srvUri.getRawPath().length() != 0) {
 				path = srvUri.getRawPath();
-				if (srvUri.getRawQuery() != null && !srvUri.getRawQuery().isEmpty()) {
+				//if (srvUri.getRawQuery() != null && !srvUri.getRawQuery().isEmpty()) { // Cannot use for Java 1.4.2
+				if (srvUri.getRawQuery() != null && srvUri.getRawQuery().length() != 0) {
 					path += "?" + srvUri.getRawQuery();
 				}
 			}
@@ -114,7 +116,8 @@ private void sendHandshakeRequest(String key) throws IOException{
 			pw.print(LINE_SEPARATOR);
 			pw.flush();
 		} catch (URISyntaxException e) {
-			throw new IllegalStateException(e);
+			// throw new IllegalStateException(e.getMessage());  // Cannot use for Java 1.4.2
+			throw new IllegalStateException(e.getMessage());
 		}
 	}
 
@@ -142,7 +145,8 @@ private void receiveHandshakeResponse(String key) throws IOException {
 		}
 
 		String upgradeHeader = (String) headerMap.get(HTTP_HEADER_UPGRADE);
-		if(!upgradeHeader.toLowerCase().contains(HTTP_HEADER_UPGRADE_WEBSOCKET)){
+		//if(!upgradeHeader.toLowerCase().contains(HTTP_HEADER_UPGRADE_WEBSOCKET)){  // Cannot use for Java 1.4.2
+		if(upgradeHeader.toLowerCase().indexOf(HTTP_HEADER_UPGRADE_WEBSOCKET) == -1){
 			throw new IOException("WebSocket Response header: Incorrect upgrade.");
 		}
 

org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/util/Strings.java

@@ -78,7 +78,8 @@ public static boolean containsAny(CharSequence cs, char[] searchChars) {
 			char ch = cs.charAt(i);
 			for (int j = 0; j < searchLength; j++) {
 				if (searchChars[j] == ch) {
-					if (Character.isHighSurrogate(ch)) {
+					//if (Character.isHighSurrogate(ch)) { // Cannot use for Java 1.4.2
+					if(isHighSurrogate(ch)) {
 						if (j == searchLast) {
 							// missing low surrogate, fine, like String.indexOf(String)
 							return true;
@@ -96,6 +97,12 @@ public static boolean containsAny(CharSequence cs, char[] searchChars) {
 		}
 		return false;
 	}
+	
+	private static boolean isHighSurrogate(char ch){
+		char MAX = '\uDBFF';
+		char MIN = '\uD800';
+		return ch >= MIN &&  ch < (MAX +1);
+	}
 
 	/**
 	 * Checks if a CharSequence is empty ("") or null.