Replaces C-style array declarations with Java-style ones

orpiske · orpiske · commit e123a60f16dd · 2019-02-20T21:36:13.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/utilities/MqttV3Receiver.java b/org.eclipse.paho.client.mqttv3.test/src/test/java/org/eclipse/paho/client/mqttv3/test/utilities/MqttV3Receiver.java
@@ -204,7 +204,7 @@ public boolean validateReceipt(List<String> sendTopics, List<Integer> expectedQo
     log.entering(className, methodName, new Object[]{
         sendTopics, expectedQosList, sentBytes});
 
-    int expectedMessageNumbers[] = new int[nPublishers];
+    int[] expectedMessageNumbers = new int[nPublishers];
     for (int i = 0; i < nPublishers; i++) {
       expectedMessageNumbers[i] = 0;
     }
diff --git a/org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/security/SSLSocketFactoryFactory.java b/org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/security/SSLSocketFactoryFactory.java
@@ -133,11 +133,11 @@ public class SSLSocketFactoryFactory {
 	
 
 	public static final String DEFAULT_PROTOCOL = "TLS";  // "SSL_TLS" is not supported by DesktopEE
-	
-	private static final String propertyKeys[] = { SSLPROTOCOL, JSSEPROVIDER,
-			KEYSTORE, KEYSTOREPWD, KEYSTORETYPE, KEYSTOREPROVIDER, KEYSTOREMGR, 
-			TRUSTSTORE, TRUSTSTOREPWD, TRUSTSTORETYPE, TRUSTSTOREPROVIDER, 
-			TRUSTSTOREMGR, CIPHERSUITES, CLIENTAUTH};
+
+    private static final String[] propertyKeys = {SSLPROTOCOL, JSSEPROVIDER,
+            KEYSTORE, KEYSTOREPWD, KEYSTORETYPE, KEYSTOREPROVIDER, KEYSTOREMGR,
+            TRUSTSTORE, TRUSTSTOREPWD, TRUSTSTORETYPE, TRUSTSTOREPROVIDER,
+            TRUSTSTOREMGR, CIPHERSUITES, CLIENTAUTH};
 
 	private Hashtable configs; // a hashtable that maps configIDs to properties.
 
diff --git a/org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/websocket/WebSocketFrame.java b/org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/websocket/WebSocketFrame.java
@@ -26,7 +26,7 @@ public class WebSocketFrame {
 
 	private byte opcode;
 	private boolean fin;
-	private byte payload[];
+	private byte[] payload;
 	private boolean closeFlag = false;
 
 	public byte getOpcode() {
@@ -97,7 +97,7 @@ public WebSocketFrame(byte[] rawFrame) {
 		}
 
 		// Get the Masking key if masked
-		byte maskingKey[] = null;
+		byte[] maskingKey = null;
 		if (masked) {
 			maskingKey = new byte[4];
 			buffer.get(maskingKey, 0, 4);
@@ -163,7 +163,7 @@ public WebSocketFrame(InputStream input) throws IOException {
 			}
 
 			// Get the masking key
-			byte maskingKey[] = null;
+			byte[] maskingKey = null;
 			if (masked) {
 				maskingKey = new byte[4];
 				input.read(maskingKey, 0, 4);
@@ -211,7 +211,7 @@ public byte[] encodeFrame() {
 
 		ByteBuffer buffer = ByteBuffer.allocate(length);
 		appendFinAndOpCode(buffer, this.opcode, this.fin);
-		byte mask[] = generateMaskingKey();
+		byte[] mask = generateMaskingKey();
 		appendLengthAndMask(buffer, this.payload.length, mask);
 
 		for (int i = 0; i < this.payload.length; i++) {
@@ -232,7 +232,7 @@ public byte[] encodeFrame() {
 	 * @param mask
 	 *            The WebSocket Mask
 	 */
-	public static void appendLengthAndMask(ByteBuffer buffer, int length, byte mask[]) {
+	public static void appendLengthAndMask(ByteBuffer buffer, int length, byte[] mask) {
 		if (mask != null) {
 			appendLength(buffer, length, true);
 			buffer.put(mask);
diff --git a/org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/wire/MqttWireMessage.java b/org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/internal/wire/MqttWireMessage.java
@@ -51,9 +51,9 @@ public abstract class MqttWireMessage {
 
 	protected static final Charset STRING_ENCODING = StandardCharsets.UTF_8;
 
-	private static final String PACKET_NAMES[] = { "reserved", "CONNECT", "CONNACK", "PUBLISH", "PUBACK", "PUBREC",
+	private static final String[] PACKET_NAMES = {"reserved", "CONNECT", "CONNACK", "PUBLISH", "PUBACK", "PUBREC",
 			"PUBREL", "PUBCOMP", "SUBSCRIBE", "SUBACK", "UNSUBSCRIBE", "UNSUBACK", "PINGREQ", "PINGRESP",
-			"DISCONNECT" };
+			"DISCONNECT"};
 	
 
 	private static final long FOUR_BYTE_INT_MAX = 4294967295L;
diff --git a/org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/logging/SimpleLogFormatter.java b/org.eclipse.paho.client.mqttv3/src/main/java/org/eclipse/paho/client/mqttv3/logging/SimpleLogFormatter.java
@@ -49,7 +49,7 @@ public String format(LogRecord r) {
 			if (cnl>20) {
 				cn = r.getSourceClassName().substring(cnl-19);
 			} else {
-				char sp[] = {' '};
+				char[] sp = {' '};
 				StringBuffer sb1= new StringBuffer().append(cnm);
 				cn = sb1.append(sp,0, 1).toString();
 			}
diff --git a/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/logging/SimpleLogFormatter.java b/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/logging/SimpleLogFormatter.java
@@ -49,7 +49,7 @@ public String format(LogRecord r) {
 			if (cnl>20) {
 				cn = r.getSourceClassName().substring(cnl-19);
 			} else {
-				char sp[] = {' '};
+				char[] sp = {' '};
 				StringBuffer sb1= new StringBuffer().append(cnm);
 				cn = sb1.append(sp,0, 1).toString();
 			}
diff --git a/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/security/SSLSocketFactoryFactory.java b/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/security/SSLSocketFactoryFactory.java
@@ -133,10 +133,10 @@ public class SSLSocketFactoryFactory {
 	
 
 	public static final String DEFAULT_PROTOCOL = "TLS";  // "SSL_TLS" is not supported by DesktopEE
-	
-	private static final String propertyKeys[] = { SSLPROTOCOL, JSSEPROVIDER,
-			KEYSTORE, KEYSTOREPWD, KEYSTORETYPE, KEYSTOREPROVIDER, KEYSTOREMGR, 
-			TRUSTSTORE, TRUSTSTOREPWD, TRUSTSTORETYPE, TRUSTSTOREPROVIDER, 
+
+	private static final String[] propertyKeys = {SSLPROTOCOL, JSSEPROVIDER,
+			KEYSTORE, KEYSTOREPWD, KEYSTORETYPE, KEYSTOREPROVIDER, KEYSTOREMGR,
+			TRUSTSTORE, TRUSTSTOREPWD, TRUSTSTORETYPE, TRUSTSTOREPROVIDER,
 			TRUSTSTOREMGR, CIPHERSUITES, CLIENTAUTH};
 
 	private Hashtable<String, Properties> configs; // a hashtable that maps configIDs to properties.
diff --git a/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/websocket/WebSocketFrame.java b/org.eclipse.paho.mqttv5.client/src/main/java/org/eclipse/paho/mqttv5/client/websocket/WebSocketFrame.java
@@ -26,7 +26,7 @@ public class WebSocketFrame {
 	
 	private byte opcode;
 	private boolean fin;
-	private byte payload[];
+	private byte[] payload;
 	private boolean closeFlag = false;
 	
 	public byte getOpcode() {
@@ -91,7 +91,7 @@ public  WebSocketFrame (byte[] rawFrame){
 			}
 
 			// Get the Masking key if masked
-			byte maskingKey[] = null;
+		byte[] maskingKey = null;
 			if(masked) {
 				maskingKey = new byte[4];
 				buffer.get(maskingKey,0,4);
@@ -155,7 +155,7 @@ public WebSocketFrame(InputStream input) throws IOException {
 			}
 			
 			// Get the masking key
-			byte maskingKey[] = null;
+			byte[] maskingKey = null;
 			if(masked) {
 				maskingKey = new byte[4];
 				input.read(maskingKey,0,4);
@@ -206,7 +206,7 @@ public byte[] encodeFrame(){
 
 		ByteBuffer buffer = ByteBuffer.allocate(length);
 		appendFinAndOpCode(buffer, this.opcode, this.fin);
-		byte mask[] = generateMaskingKey();
+		byte[] mask = generateMaskingKey();
 		appendLengthAndMask(buffer, this.payload.length, mask);
 
 		for(int i = 0; i < this.payload.length; i ++){
@@ -223,7 +223,7 @@ public byte[] encodeFrame(){
 	 * @param length the length of the frame
 	 * @param mask The WebSocket Mask
 	 */
-	public static void appendLengthAndMask(ByteBuffer buffer, int length, byte mask[]){
+	public static void appendLengthAndMask(ByteBuffer buffer, int length, byte[] mask){
 		if(mask != null){
 			appendLength(buffer, length, true);
 			buffer.put(mask);
diff --git a/org.eclipse.paho.mqttv5.client/src/test/java/org/eclipse/paho/mqttv5/client/test/utilities/MqttV5Receiver.java b/org.eclipse.paho.mqttv5.client/src/test/java/org/eclipse/paho/mqttv5/client/test/utilities/MqttV5Receiver.java
@@ -200,7 +200,7 @@ public boolean validateReceipt(List<String> sendTopics, List<Integer> expectedQo
     log.entering(className, methodName, new Object[]{
         sendTopics, expectedQosList, sentBytes});
 
-    int expectedMessageNumbers[] = new int[nPublishers];
+    int[] expectedMessageNumbers = new int[nPublishers];
     for (int i = 0; i < nPublishers; i++) {
       expectedMessageNumbers[i] = 0;
     }
diff --git a/org.eclipse.paho.mqttv5.common/src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttDataTypes.java b/org.eclipse.paho.mqttv5.common/src/main/java/org/eclipse/paho/mqttv5/common/packet/MqttDataTypes.java
@@ -71,7 +71,7 @@ public static void writeUnsignedFourByteInt(long value, DataOutputStream stream)
 	 *             if an exception occurs whilst reading from the Input Stream
 	 */
 	public static Long readUnsignedFourByteInt(DataInputStream inputStream) throws IOException {
-		byte readBuffer[] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+		byte[] readBuffer = {0, 0, 0, 0, 0, 0, 0, 0};
 		inputStream.readFully(readBuffer, 4, 4);
 		return (((long) readBuffer[0] << 56) + ((long) (readBuffer[1] & 255) << 48)
 				+ ((long) (readBuffer[2] & 255) << 40) + ((long) (readBuffer[3] & 255) << 32)
diff --git a/org.eclipse.paho.sample.utility/src/main/java/org/eclipse/paho/sample/utility/LED.java b/org.eclipse.paho.sample.utility/src/main/java/org/eclipse/paho/sample/utility/LED.java
@@ -31,18 +31,18 @@
 public class LED extends Panel implements Runnable {
 
 	// define the polyline for the outer border
-	private static final int xOutline[] = {2,3,4,8,9,10,10,9,9,8, 7, 3,2,2,1,1,2};
-	private static final int yOutline[] = {2,2,1,1,2, 3, 7,8,9,9,10,10,9,8,7,4,3};
+	private static final int[] xOutline = {2, 3, 4, 8, 9, 10, 10, 9, 9, 8, 7, 3, 2, 2, 1, 1, 2};
+	private static final int[] yOutline = {2, 2, 1, 1, 2, 3, 7, 8, 9, 9, 10, 10, 9, 8, 7, 4, 3};
 	private static final int nOutline = xOutline.length;
 
-	private static final int xHighlight[] = {6,7,7,8,8};
-	private static final int yHighlight[] = {8,8,7,7,6};
+	private static final int[] xHighlight = {6, 7, 7, 8, 8};
+	private static final int[] yHighlight = {8, 8, 7, 7, 6};
 	private static final int nHighlight = xHighlight.length;
 
 	// define the polyline which is the grey extra highlight
 	// when the LED is in its off state
-	private static final int xOfflight [] = {3,7,8,9,9,8,8,7,6,5,4};
-	private static final int yOfflight [] = {9,9,8,7,3,4,5,6,7,8,8};
+	private static final int[] xOfflight = {3, 7, 8, 9, 9, 8, 8, 7, 6, 5, 4};
+	private static final int[] yOfflight = {9, 9, 8, 7, 3, 4, 5, 6, 7, 8, 8};
 	private static final int nOfflight = xOfflight.length;
 
 	private static final Color OfflightColour = new Color(91,91,91);

Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ public boolean validateReceipt(List<String> sendTopics, List<Integer> expectedQo`
`204`	`204`	`log.entering(className, methodName, new Object[]{`
`205`	`205`	`sendTopics, expectedQosList, sentBytes});`
`206`	`206`
`207`		`- int expectedMessageNumbers[] = new int[nPublishers];`
	`207`	`+ int[] expectedMessageNumbers = new int[nPublishers];`
`208`	`208`	`for (int i = 0; i < nPublishers; i++) {`
`209`	`209`	`expectedMessageNumbers[i] = 0;`
`210`	`210`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public String format(LogRecord r) {`
`49`	`49`	`if (cnl>20) {`
`50`	`50`	`cn = r.getSourceClassName().substring(cnl-19);`
`51`	`51`	`} else {`
`52`		`- char sp[] = {' '};`
	`52`	`+ char[] sp = {' '};`
`53`	`53`	`StringBuffer sb1= new StringBuffer().append(cnm);`
`54`	`54`	`cn = sb1.append(sp,0, 1).toString();`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ public boolean validateReceipt(List<String> sendTopics, List<Integer> expectedQo`
`200`	`200`	`log.entering(className, methodName, new Object[]{`
`201`	`201`	`sendTopics, expectedQosList, sentBytes});`
`202`	`202`
`203`		`- int expectedMessageNumbers[] = new int[nPublishers];`
	`203`	`+ int[] expectedMessageNumbers = new int[nPublishers];`
`204`	`204`	`for (int i = 0; i < nPublishers; i++) {`
`205`	`205`	`expectedMessageNumbers[i] = 0;`
`206`	`206`	`}`