Modifications in IOSample and packet classes to do the objects or their

attributes immutables.

Signed-off-by: Tatiana Leon <tatiana.leon@digi.com>

Author: tatianaleon

library/src/main/java/com/digi/xbee/api/io/IOSample.java

@@ -345,7 +345,7 @@ public boolean hasDigitalValue(IOLine ioLine) {
 	 * @see IOValue
 	 */
 	public HashMap<IOLine, IOValue> getDigitalValues() {
-		return digitalValuesMap;
+		return (HashMap<IOLine, IOValue>) digitalValuesMap.clone();
 	}
 
 	/**
@@ -447,7 +447,7 @@ public boolean hasAnalogValue(IOLine ioLine) {
 	 * @see IOLine
 	 */
 	public HashMap<IOLine, Integer> getAnalogValues() {
-		return analogValuesMap;
+		return (HashMap<IOLine, Integer>) analogValuesMap.clone();
 	}
 
 	/**

library/src/main/java/com/digi/xbee/api/packet/GenericXBeePacket.java

@@ -114,7 +114,10 @@ public boolean needsAPIFrameID() {
 	 * @param rfData The new XBee RF Data.
 	 */
 	public void setRFData(byte[] rfData) {
-		this.rfData = rfData;
+		if (rfData == null)
+			this.rfData = null;
+		else
+			this.rfData = Arrays.copyOf(rfData, rfData.length);
 	}
 
 	/**
@@ -123,7 +126,9 @@ public void setRFData(byte[] rfData) {
 	 * @return The RF Data.
 	 */
 	public byte[] getRFData() {
-		return rfData;
+		if (rfData == null)
+			return null;
+		return Arrays.copyOf(rfData, rfData.length);
 	}
 
 	/*

library/src/main/java/com/digi/xbee/api/packet/UnknownXBeePacket.java

@@ -115,7 +115,10 @@ public boolean needsAPIFrameID() {
 	 * @param rfData The new XBee RF Data.
 	 */
 	public void setRFData(byte[] rfData) {
-		this.rfData = rfData;
+		if (rfData == null)
+			this.rfData = null;
+		else
+			this.rfData = Arrays.copyOf(rfData, rfData.length);
 	}
 
 	/**
@@ -124,7 +127,9 @@ public void setRFData(byte[] rfData) {
 	 * @return The RF Data.
 	 */
 	public byte[] getRFData() {
-		return rfData;
+		if (rfData == null)
+			return null;
+		return Arrays.copyOf(rfData, rfData.length);
 	}
 
 	/*

library/src/main/java/com/digi/xbee/api/packet/common/ExplicitAddressingPacket.java

@@ -392,7 +392,10 @@ public int getTransmitOptions() {
 	 * @param rfData RF Data to send.
 	 */
 	public void setRFData(byte[] rfData) {
-		this.rfData = rfData;
+		if (rfData == null)
+			this.rfData = null;
+		else
+			this.rfData = Arrays.copyOf(rfData, rfData.length);
 	}
 
 	/**
@@ -401,7 +404,9 @@ public void setRFData(byte[] rfData) {
 	 * @return RF Data to send.
 	 */
 	public byte[] getRFData() {
-		return rfData;
+		if (rfData == null)
+			return null;
+		return Arrays.copyOf(rfData, rfData.length);
 	}
 
 	/*

library/src/main/java/com/digi/xbee/api/packet/common/ExplicitRxIndicatorPacket.java

@@ -326,7 +326,10 @@ public int getReceiveOptions() {
 	 * @param rfData Received RF data.
 	 */
 	public void setRFData(byte[] rfData) {
-		this.rfData = rfData;
+		if (rfData == null)
+			this.rfData = null;
+		else
+			this.rfData = Arrays.copyOf(rfData, rfData.length);
 	}
 
 	/**
@@ -335,7 +338,9 @@ public void setRFData(byte[] rfData) {
 	 * @return Received RF data.
 	 */
 	public byte[] getRFData() {
-		return rfData;
+		if (rfData == null)
+			return null;
+		return Arrays.copyOf(rfData, rfData.length);
 	}
 
 	/*

library/src/main/java/com/digi/xbee/api/packet/common/IODataSampleRxIndicatorPacket.java

@@ -53,7 +53,7 @@ public class IODataSampleRxIndicatorPacket extends XBeeAPIPacket {
 	private final XBee64BitAddress sourceAddress64;
 	private final XBee16BitAddress sourceAddress16;
 
-	private final IOSample ioSample;
+	private IOSample ioSample;
 
 	private final int receiveOptions;
 
@@ -238,7 +238,16 @@ public IOSample getIOSample() {
 	 * @param rfData Received RF data.
 	 */
 	public void setRFData(byte[] rfData) {
-		this.rfData = rfData;
+		if (rfData == null)
+			this.rfData = null;
+		else
+			this.rfData = Arrays.copyOf(rfData, rfData.length);
+		
+		// Modify the ioSample accordingly.
+		if (rfData != null && rfData.length >= 5)
+			ioSample = new IOSample(this.rfData);
+		else
+			ioSample = null;
 	}
 
 	/**
@@ -247,7 +256,9 @@ public void setRFData(byte[] rfData) {
 	 * @return Received RF data.
 	 */
 	public byte[] getRFData() {
-		return rfData;
+		if (rfData == null)
+			return null;
+		return Arrays.copyOf(rfData, rfData.length);
 	}
 
 	/*

library/src/main/java/com/digi/xbee/api/packet/common/ReceivePacket.java

@@ -219,7 +219,10 @@ public int getReceiveOptions() {
 	 * @param rfData Received RF data.
 	 */
 	public void setRFData(byte[] rfData) {
-		this.rfData = rfData;
+		if (rfData == null)
+			this.rfData = null;
+		else
+			this.rfData = Arrays.copyOf(rfData, rfData.length);
 	}
 
 	/**
@@ -228,7 +231,9 @@ public void setRFData(byte[] rfData) {
 	 * @return Received RF data.
 	 */
 	public byte[] getRFData() {
-		return rfData;
+		if (rfData == null)
+			return null;
+		return Arrays.copyOf(rfData, rfData.length);
 	}
 
 	/*

library/src/main/java/com/digi/xbee/api/packet/common/TransmitPacket.java

@@ -283,7 +283,10 @@ public int getTransmitOptions() {
 	 * @param rfData RF Data to send.
 	 */
 	public void setRFData(byte[] rfData) {
-		this.rfData = rfData;
+		if (rfData == null)
+			this.rfData = null;
+		else
+			this.rfData = Arrays.copyOf(rfData, rfData.length);
 	}
 
 	/**
@@ -292,7 +295,9 @@ public void setRFData(byte[] rfData) {
 	 * @return RF Data to send.
 	 */
 	public byte[] getRFData() {
-		return rfData;
+		if (rfData == null)
+			return null;
+		return Arrays.copyOf(rfData, rfData.length);
 	}
 
 	/*

library/src/main/java/com/digi/xbee/api/packet/raw/RX16IOPacket.java

@@ -43,7 +43,7 @@ public class RX16IOPacket extends XBeeAPIPacket {
 	// Variables.
 	private final XBee16BitAddress sourceAddress16;
 
-	private final IOSample ioSample;
+	private IOSample ioSample;
 
 	private final int rssi;
 	private final int receiveOptions;
@@ -229,7 +229,16 @@ public IOSample getIOSample() {
 	 * @param rfData Received RF data.
 	 */
 	public void setRFData(byte[] rfData) {
-		this.rfData = rfData;
+		if (rfData == null)
+			this.rfData = null;
+		else
+			this.rfData = Arrays.copyOf(rfData, rfData.length);
+		
+		// Modify the ioSample accordingly.
+		if (rfData != null && rfData.length >= 5)
+			ioSample = new IOSample(this.rfData);
+		else
+			ioSample = null;
 	}
 
 	/**
@@ -238,7 +247,9 @@ public void setRFData(byte[] rfData) {
 	 * @return Received RF data.
 	 */
 	public byte[] getRFData() {
-		return rfData;
+		if (rfData == null)
+			return null;
+		return Arrays.copyOf(rfData, rfData.length);
 	}
 
 	/*

library/src/main/java/com/digi/xbee/api/packet/raw/RX16Packet.java

@@ -214,7 +214,10 @@ public int getReceiveOptions() {
 	 * @param rfData Received RF data.
 	 */
 	public void setRFData(byte[] rfData) {
-		this.rfData = rfData;
+		if (rfData == null)
+			this.rfData = null;
+		else
+			this.rfData = Arrays.copyOf(rfData, rfData.length);
 	}
 
 	/**
@@ -223,7 +226,9 @@ public void setRFData(byte[] rfData) {
 	 * @return Received RF data.
 	 */
 	public byte[] getRFData() {
-		return rfData;
+		if (rfData == null)
+			return null;
+		return Arrays.copyOf(rfData, rfData.length);
 	}
 
 	/*