Merge pull request tlaukkan#88 from DevFactory/release/method-invokes-inefficient-number-constructor-fix-1

Brhett · Brhett · commit fcdfd138e0de · 2016-05-11T10:01:47.000+08:00
Code quality fix - Method invokes inefficient Number constructor; use static valueOf instead.
diff --git a/zigbee-api/src/main/java/org/bubblecloud/zigbee/api/cluster/impl/core/AnalogReporterImpl.java b/zigbee-api/src/main/java/org/bubblecloud/zigbee/api/cluster/impl/core/AnalogReporterImpl.java
@@ -104,9 +104,9 @@ public Object getReportableChange() {
     private void setReportableChangeValue(Number n) {
         final ZigBeeType type = attribute.getZigBeeType();
         if (type.getJavaClass() == Long.class) {
-            minimumChange = new Long(n.longValue());
+            minimumChange = Long.valueOf(n.longValue());
         } else if (type.getJavaClass() == Integer.class) {
-            minimumChange = new Integer(n.intValue());
+            minimumChange = Integer.valueOf(n.intValue());
         } else if (type.getJavaClass() == Float.class) {
             minimumChange = new Float(n.floatValue());
         } else if (type.getJavaClass() == Double.class) {
diff --git a/zigbee-api/src/main/java/org/bubblecloud/zigbee/api/cluster/impl/core/DefaultDeserializer.java b/zigbee-api/src/main/java/org/bubblecloud/zigbee/api/cluster/impl/core/DefaultDeserializer.java
@@ -163,9 +163,9 @@ public Object readZigBeeType(ZigBeeType type) {
             case SignedInteger8bit:
                 byte b = read_byte();
                 if (type == ZigBeeType.UnsignedInteger8bit) {
-                    value[0] = new Integer(b & 0xFF);
+                    value[0] = Integer.valueOf(b & 0xFF);
                 } else {
-                    value[0] = new Integer(b);
+                    value[0] = Integer.valueOf(b);
                 }
                 break;
             case Data16bit:
@@ -186,9 +186,9 @@ public Object readZigBeeType(ZigBeeType type) {
             case SignedInteger24bit:
                 int i = read_int24bit();
                 if (type == ZigBeeType.UnsignedInteger32bit) {
-                    value[0] = new Long(i & 0xFFFFFFFF);
+                    value[0] = Long.valueOf(i & 0xFFFFFFFF);
                 } else {
-                    value[0] = new Integer(i);
+                    value[0] = Integer.valueOf(i);
                 }
                 break;
             case Data32bit:
diff --git a/zigbee-api/src/main/java/org/bubblecloud/zigbee/api/cluster/impl/security_safety/ias_ace/ZoneIDMapResponseImpl.java b/zigbee-api/src/main/java/org/bubblecloud/zigbee/api/cluster/impl/security_safety/ias_ace/ZoneIDMapResponseImpl.java
@@ -43,7 +43,7 @@ public ZoneIDMapResponseImpl(Response response) throws ZigBeeClusterException {
 
         zonesID = new ZoneTableImpl();
         for (int i = 0; i < 16; i++)
-            zonesID.addZone(new Short(deserializer.read_short()), null, null);
+            zonesID.addZone(Short.valueOf(deserializer.read_short()), null, null);
     }
 
     public Zone[] getZonesID() {
diff --git a/zigbee-api/src/main/java/org/bubblecloud/zigbee/network/impl/ZigBeeEndpointImpl.java b/zigbee-api/src/main/java/org/bubblecloud/zigbee/network/impl/ZigBeeEndpointImpl.java
@@ -404,7 +404,7 @@ public boolean providesOutputCluster(int id) {
     @Override
     public boolean bindTo(ZigBeeEndpoint endpoint, int clusterId) throws ZigBeeNetworkManagerException {
         logger.info("Binding from endpoint {} to {} for cluster {}", new Object[]{
-                getEndpointId(), endpoint.getEndpointId(), new Integer(clusterId)
+                getEndpointId(), endpoint.getEndpointId(), Integer.valueOf(clusterId)
         });
 
         final ZDO_BIND_RSP response = networkManager.sendZDOBind(new ZDO_BIND_REQ(
@@ -428,7 +428,7 @@ public boolean bindTo(ZigBeeEndpoint endpoint, int clusterId) throws ZigBeeNetwo
     @Override
     public boolean unbindFrom(ZigBeeEndpoint endpoint, int clusterId) throws ZigBeeNetworkManagerException {
         logger.info("Un-binding from endpoint {} to {} for cluster {}", new Object[]{
-                getEndpointId(), endpoint.getEndpointId(), new Integer(clusterId)
+                getEndpointId(), endpoint.getEndpointId(), Integer.valueOf(clusterId)
         });
 
         final ZDO_UNBIND_RSP response = networkManager.sendZDOUnbind(new ZDO_UNBIND_REQ(
@@ -458,7 +458,7 @@ public boolean bindToLocal(int clusterId) throws ZigBeeNetworkManagerException {
         short dstEP = ApplicationFrameworkLayer.getAFLayer(networkManager).getSendingEndpoint(this.getProfileId(), clusterId);
 
         logger.info("Binding from endpoint {} to {} for cluster {}", new Object[]{
-                getEndpointId(), IEEEAddress.toString(networkManager.getIeeeAddress()) + "/" + dstEP, new Integer(clusterId)
+                getEndpointId(), IEEEAddress.toString(networkManager.getIeeeAddress()) + "/" + dstEP, Integer.valueOf(clusterId)
         });
 
         final ZDO_BIND_RSP response = networkManager.sendZDOBind(new ZDO_BIND_REQ(
diff --git a/zigbee-api/src/main/java/org/bubblecloud/zigbee/network/port/ZigBeeNetworkManagerImpl.java b/zigbee-api/src/main/java/org/bubblecloud/zigbee/network/port/ZigBeeNetworkManagerImpl.java
@@ -1704,7 +1704,7 @@ public void createCustomDevicesOnDongle() {
                         output[j] = this.out[i][j];
                 }
 
-                if (newDevice(new AF_REGISTER(new Byte(this.ep[i] + ""), this.prof[i], new Short(this.dev[i] + ""), new Byte(this.ver[i] + ""), input, output))) {
+                if (newDevice(new AF_REGISTER(Byte.valueOf(this.ep[i] + ""), this.prof[i], Short.valueOf(this.dev[i] + ""), Byte.valueOf(this.ver[i] + ""), input, output))) {
                     logger.debug("Custom device {} registered at endpoint {}", this.dev[i], this.ep[i]);
                 }
                 else {

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public ZoneIDMapResponseImpl(Response response) throws ZigBeeClusterException {`
`43`	`43`
`44`	`44`	`zonesID = new ZoneTableImpl();`
`45`	`45`	`for (int i = 0; i < 16; i++)`
`46`		`- zonesID.addZone(new Short(deserializer.read_short()), null, null);`
	`46`	`+ zonesID.addZone(Short.valueOf(deserializer.read_short()), null, null);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`public Zone[] getZonesID() {`
Original file line number	Diff line number	Diff line change
`@@ -1704,7 +1704,7 @@ public void createCustomDevicesOnDongle() {`
`1704`	`1704`	`output[j] = this.out[i][j];`
`1705`	`1705`	`}`
`1706`	`1706`
`1707`		`- if (newDevice(new AF_REGISTER(new Byte(this.ep[i] + ""), this.prof[i], new Short(this.dev[i] + ""), new Byte(this.ver[i] + ""), input, output))) {`
	`1707`	`+ if (newDevice(new AF_REGISTER(Byte.valueOf(this.ep[i] + ""), this.prof[i], Short.valueOf(this.dev[i] + ""), Byte.valueOf(this.ver[i] + ""), input, output))) {`
`1708`	`1708`	`logger.debug("Custom device {} registered at endpoint {}", this.dev[i], this.ep[i]);`
`1709`	`1709`	`}`
`1710`	`1710`	`else {`